Skip to content

REPLACE-WITH-JIRA-KEY: Bump k8s dependencies to 1.36.2#3066

Closed
dfarrell07 wants to merge 4 commits into
openshift:masterfrom
dfarrell07:bump1.36-20260719153741
Closed

REPLACE-WITH-JIRA-KEY: Bump k8s dependencies to 1.36.2#3066
dfarrell07 wants to merge 4 commits into
openshift:masterfrom
dfarrell07:bump1.36-20260719153741

Conversation

@dfarrell07

Copy link
Copy Markdown

Summary

Rebase Kubernetes dependencies from 1.35 (v0.35.2) to 1.36.2 (v0.36.2), Go from 1.25 to 1.26.

What changed

  • Dependencies: All k8s.io/* packages bumped to v0.36.2, controller-runtime v0.23.3→v0.24.1, controller-tools v0.20.1→v0.21.0, konnectivity-client v0.34.0→v0.36.0
  • Go version: 1.25→1.26 in go.mod, Dockerfile, .ci-operator.yaml
  • Codegen: CRD manifest annotation updated (controller-gen v0.20.1→v0.21.0)
  • Feature gate: Added KUBE_FEATURE_WatchListClient=false in hack/test-go.sh to prevent test hangs with fake clientsets
  • Dep changes: go-grpc-prometheus replaced by go-grpc-middleware/providers/prometheus (upstream migration), k8s.io/streaming added (new in 1.36), google/btree removed

Commits

Commit Description Type
41ba266 Rebase k8s-rebase-1.36.2 to k8s 1.36 Mechanical (deps)
2cfde3f Update codegen for k8s 1.36 Mechanical (codegen)
bff8adc Update version references for k8s 1.36 Mechanical (version refs)
ae34152 Disable WatchListClient feature gate in test-go.sh Fix

Verification

Locally verified (all in Go 1.26.0 container):

  • go build ./... — PASS
  • go vet ./... — PASS
  • golangci-lint run — PASS
  • go test ./... — PASS (1 pre-existing failure in pkg/controller/proxyconfig due to missing CA trust bundle in container — not related to this change)
  • go mod verify — all modules verified
  • No Go source files changed outside vendor/

Prerequisites

  • CI builder images rhel-9-golang-1.26-openshift-4.22 must be available in the registry

Notes

  • Zero Go source code changes were required — the k8s 1.36 APIs had no breaking changes affecting this project
  • All commits carry Assisted-by: Claude Code trailers

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>
Add KUBE_FEATURE_WatchListClient=false export to prevent potential
test hangs with fake clientsets that don't support the streaming
list protocol.

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

openshift-ci Bot commented Jul 19, 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 19, 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: 0230d729-71c8-494c-9319-bdb00dfee704

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 19, 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

@dfarrell07 dfarrell07 closed this Jul 23, 2026
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