Skip to content

WIP: Rebase 1.34#332

Closed
jacobsee wants to merge 3 commits intoopenshift:masterfrom
jacobsee:rebase-1.34
Closed

WIP: Rebase 1.34#332
jacobsee wants to merge 3 commits intoopenshift:masterfrom
jacobsee:rebase-1.34

Conversation

@jacobsee
Copy link
Member

No description provided.

@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 28, 2025
@openshift-ci openshift-ci bot requested review from bertinatto and deads2k July 28, 2025 23:46
@jacobsee jacobsee force-pushed the rebase-1.34 branch 2 times, most recently from cf986eb to b8b6d6a Compare July 29, 2025 04:47
@jacobsee jacobsee force-pushed the rebase-1.34 branch 3 times, most recently from 5f6b40e to 0febb84 Compare August 12, 2025 01:38
@erikgb
Copy link

erikgb commented Aug 29, 2025

@jacobsee, what is the status here on upgrading to K8s 1.34 dependencies? Downstream projects are unable to upgrade to K8s 1.34 until it's done here. It is required to upgrade to sigs.k8s.io/structured-merge-diff/v6.

=== Errors                                                                                                                                                                                                                        
../../../go/pkg/mod/github.com/openshift/client-go@v0.0.0-20250811163556-6193816ae379/route/applyconfigurations/route/v1/route.go:58:42: cannot use internal.Parser().Type("com.github.openshift.api.route.v1.Route") (value of struct type "sigs.k8s.io/structured-merge-diff/v4/typed".ParseableType) as "sigs.k8s.io/structured-merge-diff/v6/typed".ParseableType value in argument to managedfields.ExtractInto

@jacobsee
Copy link
Member Author

@erikgb Hi - final 1.34.0 tags were cut upstream two days ago. I plan on having a new set of rebase PRs out hopefully around EOD, but we will need openshift/api to merge before this one.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 16, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: jacobsee
Once this PR has been reviewed and has the lgtm label, please assign joelspeed 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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 16, 2025

@jacobsee: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@kevinwangcn
Copy link

@jacobsee, when is this PR expected to be merged? The change sigs.k8s.io/structured-merge-diff/v6 v6.3.0 will resolve the CVE issue.

k8s.io/apimachinery v0.34.1
k8s.io/client-go v0.34.1
k8s.io/code-generator v0.34.1
sigs.k8s.io/structured-merge-diff/v6 v6.3.0

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I created a new PR with: #342
But has not the replace.

Could someone help us get it merged?
It is blocking other projects from getting updated.

@bertinatto
Copy link
Member

/close
in favor of #343

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 15, 2025
@openshift-merge-robot
Copy link
Contributor

PR needs rebase.

Details

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.

@openshift-ci openshift-ci bot closed this Oct 15, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 15, 2025

@bertinatto: Closed this PR.

Details

In response to this:

/close
in favor of #343

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.

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. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants