Skip to content

CNTRLPLANE-1676: Rebase k8s 1.34 #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 5 commits into from
Nov 28, 2025
Merged

CNTRLPLANE-1676: Rebase k8s 1.34 #402

merged 5 commits into from
Nov 28, 2025

Conversation

@vincentdephily
Copy link
Contributor

@vincentdephily vincentdephily commented Nov 27, 2025

  • Select the desired kubernetes release branch, and use its go.mod and CHANGELOG as references for the rest of the work.
  • Bump go version, all k8s.io/, github.com/openshift/, and any other relevant dependencies as needed.
  • Run go mod vendor && go mod tidy, commit that separately from all other changes.
  • Bump image versions (Dockerfile, ci...) if needed.
  • Run make build verify test.
  • Make code changes as needed until the above pass.
  • Any other minor update, like documentation.

@vincentdephily
chore: Switch from k8s.io/apimachinery/pkg/util/diff to github.com/go…
8731c0b 
…ogle/go-cmp/cmp

The former is deprecated in favor of the later in k8s 1.33, and
removed in 1.34.
@vincentdephily
chore: Update deps for k8s 1.34.2
277b0bf 
This does not currently use the latest `openshift/api`, due to
6718b87db6ea47f87debff6006ec5c1bb522f874 breaking
`openshift/client-go`.
@vincentdephily
chore: go mod vendor
d1a08da
@vincentdephily
fix: Add missing VersionGetter interface method to `operator.versio…
8e726aa 
…nGetter`

It's a trivial no-op because our `versionGetter` is dynamic.
@vincentdephily
doc: Add rebase checklist to readme
03c4cf0
@openshift-ci openshift-ci bot requested review from bparees and prabhapa November 27, 2025 13:31
@vincentdephily vincentdephily changed the title Rebase 1.34 CNTRLPLANE-1676: Rebase k8s 1.34 Nov 27, 2025
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 27, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 27, 2025 •
edited by openshift-ci bot
Loading

@vincentdephily: This pull request references CNTRLPLANE-1676 which is a valid jira issue.

In response to this:

  • Select the desired kubernetes release branch, and use its go.mod and CHANGELOG as references for the rest of the work.
  • Bump go version, all k8s.io/, github.com/openshift/, and any other relevant dependencies as needed.
  • Run go mod vendor && go mod tidy, commit that separately from all other changes.
  • Bump image versions (Dockerfile, ci...) if needed.
  • Run make build verify test.
  • Make code changes as needed until the above pass.
  • Any other minor update, like documentation.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 27, 2025

@vincentdephily: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@ingvagabund
Copy link
Member

ingvagabund commented Nov 28, 2025

/approve
/lgtm

@ingvagabund
Copy link
Member

ingvagabund commented Nov 28, 2025

/verified by CI

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2025
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 28, 2025
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Nov 28, 2025

@ingvagabund: This PR has been marked as verified by CI.

In response to this:

/verified by CI

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 28, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ingvagabund, vincentdephily

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 28, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 54ccb63 into openshift:master Nov 28, 2025
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bparees bparees Awaiting requested review from bparees

@prabhapa prabhapa Awaiting requested review from prabhapa

Assignees

@ingvagabund ingvagabund

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@vincentdephily @openshift-ci-robot @ingvagabund