Skip to content

Switch to canonical json-patch v4 import #1923

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.

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

Merged
merged 1 commit into from
Feb 3, 2025

Conversation

skitt
Copy link
Member

@skitt skitt commented Jan 17, 2025

This matches k/k upstream, see
kubernetes/kubernetes#123339 for details.

@openshift-ci openshift-ci bot requested review from deads2k and jsafrane January 17, 2025 12:38
@skitt skitt force-pushed the canonical-json-patch branch from feee9e9 to c372611 Compare January 17, 2025 12:47
This matches k/k upstream, see
kubernetes/kubernetes#123339 for details.

Signed-off-by: Stephen Kitt <[email protected]>
@skitt skitt force-pushed the canonical-json-patch branch from c372611 to 42b9735 Compare January 30, 2025 17:25
@skitt
Copy link
Member Author

skitt commented Jan 30, 2025

@bertinatto what would the process be to get this and #1924 reviewed? Should I open JIRA issues?

Copy link
Contributor

openshift-ci bot commented Jan 30, 2025

@skitt: 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.

Copy link
Member

@bertinatto bertinatto left a comment

Choose a reason for hiding this comment

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

Makes sense to me, this matches 4.19:

https://github.com/openshift/kubernetes/blob/release-4.19/go.mod#L94

Also, I don't see any code changes in the vendor directory, just an import in one of our packages (which is good).

We had problems with this package being inadvertently updated and importing breaking changes, so fixing the import makes sense.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2025
Copy link
Contributor

openshift-ci bot commented Feb 3, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bertinatto, skitt

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 Feb 3, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 8062087 into openshift:master Feb 3, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants