Skip to content

REPLACE-WITH-JIRA-KEY: Rebase to Kubernetes 1.36#3060

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

REPLACE-WITH-JIRA-KEY: Rebase to Kubernetes 1.36#3060
dfarrell07 wants to merge 4 commits into
openshift:masterfrom
dfarrell07:bump1.36-20260717143156

Conversation

@dfarrell07

Copy link
Copy Markdown

Summary

Rebase cluster-network-operator to Kubernetes 1.36.2 (Go 1.26.0).

  • Bump all k8s.io/* dependencies from v0.35.2 to v0.36.2
  • 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
  • Update CI builder images from golang-1.25-openshift-4.22 to golang-1.26-openshift-5.0
  • Update base image from ocp/4.22 to ocp/5.0
  • Disable WatchListClient feature gate for test compatibility
  • Update controller-gen annotation in CRD manifest

What changed

Commit Description Type
d35ac6a Rebase cluster-network-operator to k8s 1.36 Mechanical
3dda36c Update codegen for k8s 1.36 Mechanical
b63a4eb Update version references for k8s 1.36 Mechanical
c346d3c Disable new default-true feature gates for k8s 1.36 Autofix

Key dependency changes

  • k8s.io/* v0.35.2 -> v0.36.2
  • Go 1.25.0 -> 1.26.0
  • controller-runtime v0.23.3 -> v0.24.1
  • controller-tools v0.20.1 -> v0.21.0
  • grpc-ecosystem/go-grpc-prometheus replaced by go-grpc-middleware/providers/prometheus
  • New k8s.io/streaming module added (k8s 1.36)
  • 10 HIGH/CRITICAL CVEs fixed by dependency bumps (9 in golang.org/x/crypto, 1 in google.golang.org/grpc)

Verification

Passed locally:

  • go build ./...
  • go vet ./...
  • golangci-lint (v2)
  • go test -run='^$' ./... (format string validation)
  • Unit tests (all packages except proxyconfig which requires system CA certs not available in golang container -- pre-existing, passes in RHEL CI images)

Notes

  • golang.org/x/net and google.golang.org/protobuf resolve to pseudo-versions -- standard for k8s rebases where the dep graph requires specific unreleased commits
  • Dockerfile.rhel7 still references Go 1.19/OCP 4.14 -- pre-existing legacy file, not part of this rebase

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
.ci-operator.yaml
Dockerfile

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>
@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

@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: eb46f182-b6ab-4c2f-8221-4f274cfb3094

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

@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 danwinship 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