Skip to content

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

Draft
dfarrell07 wants to merge 6 commits into
openshift:masterfrom
dfarrell07:bump1.36-20260716124502
Draft

REPLACE-WITH-JIRA-KEY: Bump Kubernetes dependencies to v1.36.2#3059
dfarrell07 wants to merge 6 commits into
openshift:masterfrom
dfarrell07:bump1.36-20260716124502

Conversation

@dfarrell07

Copy link
Copy Markdown

Summary

Bump all k8s.io/* dependencies from v0.35.2 to v0.36.2 (Kubernetes 1.36.2), Go from 1.25.0 to 1.26.0, and controller-runtime from v0.23.3 to v0.24.1.

What changed

  • Dependency bump: all k8s.io/*, sigs.k8s.io/controller-runtime, sigs.k8s.io/controller-tools, and transitive dependencies updated
  • Go version: 1.25.0 → 1.26.0 (go.mod, Dockerfile, .ci-operator.yaml)
  • Codegen: controller-gen annotation updated from v0.20.1 to v0.21.0
  • Feature gates: disabled WatchListClient (default-true in k8s 1.36, breaks fake clientsets)
  • CRD fix: ASN field format corrected from int32 to int64 (max 4294967295 overflows int32)
  • Deprecated API migration: AddToScheme → Install for openshift/api types (operv1, configv1, mcfgv1, machineapi)

Commits

afaff2986 Migrate deprecated AddToScheme to Install for openshift/api types
75298d55a Fix CRD ASN field format from int32 to int64
6f8fb96ee Disable new default-true feature gates for k8s 1.36
3ff05c7aa Update version references for k8s 1.36
86c80828f Update codegen for k8s 1.36
51da95cf8 Rebase k8s-rebase-1.36.2 to k8s 1.36

Commits 51da95c, 86c8082, 3ff05c7 are mechanical (script-generated). Commits 6f8fb96, 75298d5, afaff29 are targeted fixes.

CVE improvements

This rebase fixes 10 HIGH/CRITICAL CVEs in transitive dependencies:

  • 1 CRITICAL in google.golang.org/grpc (auth bypass, CVE-2026-33186)
  • 1 CRITICAL + 1 HIGH in golang.org/x/net (Punycode validation, HTTP/2 DoS)
  • 7 CRITICAL + 2 HIGH in golang.org/x/crypto/ssh (not directly imported)

Verification

  • go build ./... — PASS
  • go vet ./... — PASS
  • golangci-lint run — PASS (0 issues)
  • go test ./pkg/... — PASS (all 17 packages)
  • Antagonistic review — APPROVE

Notes

  • The golang-1.26-openshift-4.22 CI builder image may not exist yet — if CI fails at image pull, the OCP stream in .ci-operator.yaml and Dockerfile may need adjusting
  • All commits carry Assisted-by: Claude Code trailers

/cc @openshift/networking

go get k8s.io/apiextensions-apiserver@v0.36.2
go get k8s.io/apiserver@v0.36.2
go get k8s.io/api@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
./.rebase-tmp/k8s-rebase-patched.sh

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Assisted-by: Claude Code <noreply@anthropic.com>
Applied: disable problematic feature gates for tests
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Assisted-by: Claude Code <noreply@anthropic.com>
The ASN field maximum is 4294967295 (2^32-1), which overflows
int32. Change format to int64 to correctly represent the full
ASN range.

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Assisted-by: Claude Code <noreply@anthropic.com>
The openshift/api packages mark AddToScheme as deprecated in favor
of Install. Migrate all call sites for operv1, configv1, mcfgv1,
and machineapi packages. The k8s.io packages (appsv1, corev1,
certificatev1, apiextensionsv1) only expose AddToScheme and are
left unchanged.

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 requested a review from a team July 16, 2026 17:36
@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 16, 2026
@openshift-ci

openshift-ci Bot commented Jul 16, 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 16, 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: 23af2c3b-c3df-45e7-8f91-6544b1e9d7d9

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 16, 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 jcaamano 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