Skip to content

REPLACE-WITH-JIRA-KEY: Rebase k8s to 1.36.2#247

Draft
dfarrell07 wants to merge 1 commit into
openshift:mainfrom
dfarrell07:bump1.36-20260721102838
Draft

REPLACE-WITH-JIRA-KEY: Rebase k8s to 1.36.2#247
dfarrell07 wants to merge 1 commit into
openshift:mainfrom
dfarrell07:bump1.36-20260721102838

Conversation

@dfarrell07

Copy link
Copy Markdown

Summary

Rebase Kubernetes dependencies from 1.35 (v0.35.0) to 1.36 (v0.36.2), Go 1.25.0 → 1.26.0.

  • Bump all k8s.io/* packages to v0.36.2
  • Bump sigs.k8s.io/controller-runtime to v0.24.1
  • Bump Go version to 1.26.0
  • Update openshift/{api,client-go,library-go} to latest

What changed

This is a pure dependency rebase — no source code changes were required. The k8s 1.36 API is fully backward-compatible with this project's usage.

Notable dependency changes:

  • github.com/gogo/protobuf removed (upstream k8s dropped it)
  • google.golang.org/protobuf moved to pseudo-version required by k8s 1.36
  • k8s.io/klog/v2 bumped to v2.140.0
  • OTel, gRPC, and golang.org/x/* transitively bumped

New default-true feature gates in k8s 1.36:

  • AtomicFIFO, ClientsAllowCARotation, ClientsAllowTLSCacheGC, InOrderInformers, UnlockWhileProcessingFIFO

Commits

b585a80b Rebase k8s-rebase-1.36.2 to k8s 1.36

Single mechanical commit: go get all k8s.io packages to v0.36.2, go mod tidy, go mod vendor.

Verification

All checks passed locally:

  • go build ./... — PASS
  • go vet ./... — PASS
  • golangci-lint run — PASS
  • Unit tests (3 packages, 22 tests) — ALL PASS
  • staticcheck -checks SA1019 — no deprecated API usage
  • No CVEs (HIGH/CRITICAL) in bumped dependencies
  • K8s 1.36 changelog reviewed — no breaking changes affect this repo
  • Antagonistic review — APPROVE

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/apimachinery@v0.36.2
go get k8s.io/apiserver@v0.36.2
go get k8s.io/client-go@v0.36.2
go get k8s.io/cloud-provider@v0.36.2
go get k8s.io/component-base@v0.36.2
go get sigs.k8s.io/controller-runtime@v0.24.1
go get github.com/openshift/api
go get github.com/openshift/client-go
go get github.com/openshift/library-go
go get k8s.io/klog/v2
go get k8s.io/kube-aggregator
go get k8s.io/kube-openapi
go get k8s.io/utils
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>
@coderabbitai

coderabbitai Bot commented Jul 21, 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: 93172758-1902-454a-b0c4-959ffdbfe75d

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

openshift-ci Bot commented Jul 21, 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 21, 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 abhat 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