Skip to content

REPLACE-WITH-JIRA-KEY: Bump Kubernetes dependencies to v1.36.2#3062

Draft
dfarrell07 wants to merge 4 commits into
openshift:masterfrom
dfarrell07:bump1.36-20260717170147
Draft

REPLACE-WITH-JIRA-KEY: Bump Kubernetes dependencies to v1.36.2#3062
dfarrell07 wants to merge 4 commits into
openshift:masterfrom
dfarrell07:bump1.36-20260717170147

Conversation

@dfarrell07

Copy link
Copy Markdown

Summary

  • Bump all k8s.io/* dependencies from v0.35.2 to v0.36.2
  • Bump Go version from 1.25.0 to 1.26.0
  • Bump sigs.k8s.io/controller-runtime from v0.23.3 to v0.24.1
  • Bump sigs.k8s.io/controller-tools from v0.20.1 to v0.21.0

What changed

Commit Description Mechanical?
98d0a05 Rebase k8s-rebase-1.36.2 to k8s 1.36 Yes (go.mod/vendor)
656fa7a Update codegen for k8s 1.36 Yes (CRD annotation bump)
5054bd3 Update version references for k8s 1.36 Yes (Dockerfile, .ci-operator.yaml)
da2cd20 Disable WatchListClient feature gate in test-go.sh No (manual fix)

Details

No Go source files were modified outside of vendor/. The k8s 1.36 API surface is fully compatible with CNO's existing code.

The only non-mechanical change disables the WatchListClient feature gate (default-true since k8s 1.35) in hack/test-go.sh. This prevents unit test hangs caused by fake clientsets not implementing the streaming list protocol.

Security improvement: This rebase fixes 37 known CVEs in transitive dependencies, including a critical gRPC auth bypass (GHSA-p77j-4mvh-x3m3, CVSS 9.1) in google.golang.org/grpc.

Verification

Locally verified:

  • go build ./... -- PASS
  • go vet ./... -- PASS
  • golangci-lint run -- PASS
  • Unit tests -- PASS (16/17 packages; pkg/controller/proxyconfig fails due to missing /etc/pki/ca-trust/ in container env, pre-existing)
  • Independent antagonistic review -- APPROVE

All commits carry Assisted-by: Claude Code trailers.

CI Notes

  • Builder images reference golang-1.26-openshift-4.22 -- verify ART has published these.
  • .snyk uses vendor/** glob exclusion (safe for vendor changes).

go get k8s.io/api@v0.36.2
go get k8s.io/apiextensions-apiserver@v0.36.2
go get k8s.io/apiserver@v0.36.2
go get k8s.io/client-go@v0.36.2
go get k8s.io/code-generator@v0.36.2
go get k8s.io/component-base@v0.36.2
go get k8s.io/kms@v0.36.2
go get k8s.io/kube-aggregator@v0.36.2
go get k8s.io/kube-proxy@v0.36.2
go get sigs.k8s.io/controller-runtime@v0.24.1
go get github.com/openshift/api
go get github.com/openshift/build-machinery-go
go get github.com/openshift/client-go
go get github.com/openshift/library-go
go get k8s.io/apimachinery
go get k8s.io/gengo/v2
go get k8s.io/klog/v2
go get k8s.io/kube-openapi
go get k8s.io/utils
go get sigs.k8s.io/apiserver-network-proxy/konnectivity-client
go get sigs.k8s.io/controller-tools
go get sigs.k8s.io/json
go get sigs.k8s.io/kube-storage-version-migrator
go get sigs.k8s.io/randfill
go get sigs.k8s.io/structured-merge-diff/v6
go get sigs.k8s.io/yaml
go mod tidy

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Assisted-by: Claude Code <noreply@anthropic.com>
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Assisted-by: Claude Code <noreply@anthropic.com>
./.ci-operator.yaml
./Dockerfile

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Assisted-by: Claude Code <noreply@anthropic.com>
WatchListClient (default-true since k8s 1.35) changes the initial
list mechanism to streaming lists. Fake clientsets don't implement
this protocol, causing informer hangs in unit tests.

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Assisted-by: Claude Code <noreply@anthropic.com>
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@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 17, 2026
@openshift-ci

openshift-ci Bot commented Jul 17, 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 17, 2026

Copy link
Copy Markdown

Important

Review skipped

Draft detected.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 931661f3-6860-42c8-a7c2-29dc1570ef0c

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci

openshift-ci Bot commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dfarrell07
Once this PR has been reviewed and has the lgtm label, please assign tssurya for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant