Skip to content

WINC-1992: React to 1.36 kube rebase - #4378

Merged
openshift-merge-bot[bot] merged 14 commits into
openshift:masterfrom
jrvaldes:master-submodule-update-07-29
Jul 30, 2026
Merged

WINC-1992: React to 1.36 kube rebase#4378
openshift-merge-bot[bot] merged 14 commits into
openshift:masterfrom
jrvaldes:master-submodule-update-07-29

Conversation

@jrvaldes

@jrvaldes jrvaldes commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

Summary by CodeRabbit

  • New Features

    • Added Kubernetes 1.36 compatibility.
  • Updates

    • Increased the minimum supported Kubernetes version to 1.36.0.
    • Updated version validation logic and tests to match the new supported boundaries.
    • Refreshed bundled Kubernetes-related components and cloud/networking provider dependencies.
  • Bug Fixes

    • Improved warning event formatting when node update reconciliation fails.

jrvaldes added 14 commits July 29, 2026 12:30
Update to openshift/ovn-kubernetes@4c92603

This commit was generated using hack/update_submodules.sh
Update to openshift/kubernetes@a80dac2

This commit was generated using hack/update_submodules.sh
This commit was generated using hack/update_submodules.sh
This commit was generated using hack/update_submodules.sh
Update to openshift/cloud-provider-azure@f2af9b4

This commit was generated using hack/update_submodules.sh
Update to openshift/cloud-provider-aws@278e8c0

This commit was generated using hack/update_submodules.sh
This commit uses the proper constant format string "%s" with err.Error()
as the argument to satisfy the go vet printf check added
in client-go v0.36.x.
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 29, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 29, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 29, 2026

Copy link
Copy Markdown

@jrvaldes: This pull request references WINC-1992 which is a valid jira issue.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci

openshift-ci Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai

coderabbitai Bot commented Jul 29, 2026

Copy link
Copy Markdown
📝 Walkthrough

Walkthrough

The operator’s minimum Kubernetes version and validation tests move from 1.35 to 1.36. Go dependencies and Kubernetes-related modules are refreshed, while kubelet, cloud-provider, and OVN references advance to newer revisions. The Makefile kubelet revision is aligned with the updated kubelet source. Node reconciliation warning events now pass errors through an explicit format string.

Suggested reviewers: wgahnagl, mansikulkarni96

🚥 Pre-merge checks | ✅ 20
✅ Passed checks (20 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Go Best Practices & Build Tags ✅ Passed Only change is a safer Eventf format-string fix; no new error-handling or build-tag issues were introduced in the diff.
Security: Secrets, Ssh & Csr ✅ Passed No secret/SSH/CSR regressions: private keys stay in secrets, usernames stay encrypted, SSH/SFTP are closed, and CSR approval is signer/name/usages/node-validated.
Kubernetes Controller Patterns ✅ Passed PASS: The only controller change fixes Eventf formatting; reconcile still requeues on errors, and no finalizer/status/owner-ref/predicate logic changed.
Windows Service Management ✅ Passed No Windows service management code was touched; the PR only bumps versions/submodules and tweaks a controller event string, so priority/dependency/cleanup/SCM behavior is unaffected.
Platform-Specific Requirements ✅ Passed Platform-specific limits remain documented (vSphere/AWS/Azure/GCP), and the PR’s version bumps don’t regress those checks.
Stable And Deterministic Test Names ✅ Passed PASS: The only changed test file uses static t.Run names; no Ginkgo It/Describe/Context/When titles were added, and the edits only change version literals in test data.
Test Structure And Quality ✅ Passed No Ginkgo tests were changed; the touched test file is table-driven unit tests with fake clients, not cluster-interacting Ginkgo code.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the only diff is a controller Eventf format-string fix with no MicroShift-sensitive APIs.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the only test change is a standard unit test in pkg/cluster/config_test.go, with no SNO assumptions.
Topology-Aware Scheduling Compatibility ✅ Passed Only controllers/configmap_controller.go changed, and the edit is a printf format fix in Eventf; no topology, replica, affinity, or nodeSelector logic was introduced.
Ote Binary Stdout Contract ✅ Passed No touched main/init/suite entrypoints or stdout logging additions; the controller change is only Eventf formatting, not stdout.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the only test changes are unit-test version vectors, with no external connectivity or IPv6-specific issues.
No-Weak-Crypto ✅ Passed No new weak-crypto or secret-compare patterns appear in the PR; Blowfish was already present in vendored x/crypto before the change.
Container-Privileges ✅ Passed PR diff only bumps versions and tweaks one Eventf call; no new privileged, hostPID/Network/IPC, SYS_ADMIN, or allowPrivilegeEscalation settings were added.
No-Sensitive-Data-In-Logs ✅ Passed Only log-related change is Eventf formatting; no new secrets/PII/hostnames are logged in the touched diff.
Title check ✅ Passed The title accurately summarizes the main change: updating the repo for the Kubernetes 1.36 rebase.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@jrvaldes

Copy link
Copy Markdown
Contributor Author

/test ?

@openshift-ci

openshift-ci Bot commented Jul 29, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jrvaldes

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jrvaldes

Copy link
Copy Markdown
Contributor Author

/test aws-e2e-operator

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 29, 2026
@jrvaldes

Copy link
Copy Markdown
Contributor Author

/test lint

@jrvaldes

Copy link
Copy Markdown
Contributor Author

/test unit

@jrvaldes
jrvaldes marked this pull request as ready for review July 29, 2026 20:25
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 29, 2026
@jrvaldes

Copy link
Copy Markdown
Contributor Author

@coderabbitai full review

@coderabbitai

coderabbitai Bot commented Jul 29, 2026

Copy link
Copy Markdown
✅ Action performed

Full review finished.

@jrvaldes

Copy link
Copy Markdown
Contributor Author

/retest

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🧹 Nitpick comments (1)
pkg/cluster/config_test.go (1)

128-130: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Cover the new upper Kubernetes version boundary.

The validator now accepts v1.36.x through v1.37.x, but these cases only exercise the lower boundary and an out-of-range v1.38.2. Add explicit v1.37.x acceptance and v1.38.0 rejection cases so regressions in maxK8sVersion are caught.

Suggested test cases
+		{"cluster version immediately below supported version", "v1.35.4", true},
 		{"cluster version equals supported version", "v1.36.0", false},
 		{"cluster version equals supported version", "v1.36.4", false},
+		{"cluster version at upper supported version", "v1.37.4", false},
+		{"cluster version immediately above supported version", "v1.38.0", true},
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@pkg/cluster/config_test.go` around lines 128 - 130, Extend the version table
in the cluster version validation tests to cover the upper boundary: add
accepted v1.37.x cases and an explicitly rejected v1.38.0 case. Keep the
existing lower-boundary and v1.38.2 cases unchanged, using the same test
structure and validator exercised by the surrounding cases.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@go.mod`:
- Line 130: Update the google.golang.org/grpc dependency from v1.79.3 to v1.82.1
or newer, then regenerate the module graph so go.mod and go.sum reflect the
patched release and its resolved dependencies.

---

Nitpick comments:
In `@pkg/cluster/config_test.go`:
- Around line 128-130: Extend the version table in the cluster version
validation tests to cover the upper boundary: add accepted v1.37.x cases and an
explicitly rejected v1.38.0 case. Keep the existing lower-boundary and v1.38.2
cases unchanged, using the same test structure and validator exercised by the
surrounding cases.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

Comment thread go.mod
@mansikulkarni96

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 29, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD 3444a90 and 2 for PR HEAD 0cdad6e in total

@mansikulkarni96

Copy link
Copy Markdown
Member

/retest-required

@jrvaldes

Copy link
Copy Markdown
Contributor Author

/override ci/prow/vsphere-disconnected-e2e-operator

@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

@jrvaldes: Overrode contexts on behalf of jrvaldes: ci/prow/vsphere-disconnected-e2e-operator

Details

In response to this:

/override ci/prow/vsphere-disconnected-e2e-operator

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@jrvaldes

Copy link
Copy Markdown
Contributor Author

@rrasouli please investigate aws-e2e-ote — Job failed.                    

@rrasouli

Copy link
Copy Markdown
Contributor

@rrasouli please investigate aws-e2e-ote — Job failed.

@jrvaldes 5/5 failed tests, after batch2 merged we can verify that change is working properly (SSH fix)

@jrvaldes

Copy link
Copy Markdown
Contributor Author

/override ci/prow/aws-e2e-ote

@jrvaldes

Copy link
Copy Markdown
Contributor Author

/override ci/prow/platform-none-vsphere-e2e-operator

@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

@jrvaldes: Overrode contexts on behalf of jrvaldes: ci/prow/aws-e2e-ote

Details

In response to this:

/override ci/prow/aws-e2e-ote

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

@jrvaldes: Overrode contexts on behalf of jrvaldes: ci/prow/platform-none-vsphere-e2e-operator

Details

In response to this:

/override ci/prow/platform-none-vsphere-e2e-operator

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@jrvaldes

Copy link
Copy Markdown
Contributor Author

/override ci/prow/aws-e2e-operator ci/prow/azure-e2e-operator ci/prow/azure-e2e-upgrade ci/prow/gcp-e2e-operator ci/prow/nutanix-e2e-operator ci/prow/platform-none-vsphere-e2e-operator ci/prow/vsphere-disconnected-e2e-operator ci/prow/vsphere-e2e-operator ci/prow/vsphere-proxy-e2e-operator ci/prow/images ci/prow/lint ci/prow/security ci/prow/unit ci/prow/wicd-unit-vsphere ci/prow/ci-bundle-wmco-bundle

@jrvaldes

Copy link
Copy Markdown
Contributor Author

no need to retest, diff is just ubi image bump

63cd4dc

@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

@jrvaldes: Overrode contexts on behalf of jrvaldes: ci/prow/aws-e2e-operator, ci/prow/azure-e2e-operator, ci/prow/azure-e2e-upgrade, ci/prow/ci-bundle-wmco-bundle, ci/prow/gcp-e2e-operator, ci/prow/images, ci/prow/lint, ci/prow/nutanix-e2e-operator, ci/prow/platform-none-vsphere-e2e-operator, ci/prow/security, ci/prow/unit, ci/prow/vsphere-disconnected-e2e-operator, ci/prow/vsphere-e2e-operator, ci/prow/vsphere-proxy-e2e-operator, ci/prow/wicd-unit-vsphere

Details

In response to this:

/override ci/prow/aws-e2e-operator ci/prow/azure-e2e-operator ci/prow/azure-e2e-upgrade ci/prow/gcp-e2e-operator ci/prow/nutanix-e2e-operator ci/prow/platform-none-vsphere-e2e-operator ci/prow/vsphere-disconnected-e2e-operator ci/prow/vsphere-e2e-operator ci/prow/vsphere-proxy-e2e-operator ci/prow/images ci/prow/lint ci/prow/security ci/prow/unit ci/prow/wicd-unit-vsphere ci/prow/ci-bundle-wmco-bundle

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-merge-bot
openshift-merge-bot Bot merged commit d42515d into openshift:master Jul 30, 2026
23 checks passed
@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown
Contributor

@jrvaldes: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@jrvaldes
jrvaldes deleted the master-submodule-update-07-29 branch July 31, 2026 22:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants