Skip to content
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

Jump to bottom

Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 #107569

Merged
merged 4 commits into from Jan 15, 2022
Merged

Automated cherry pick of #107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1 #107569

merged 4 commits into from Jan 15, 2022

Conversation

jiahuif
Copy link
Member

@jiahuif jiahuif commented Jan 14, 2022 •
edited

Cherry pick of #107565 on release-1.21.

#107565: upgrade sigs.k8s.io/structured-merge-diff/v4 to v4.2.1

For details on the cherry pick process, see the cherry pick requests page.

kube-apiserver: when merging lists, Server Side Apply now prefers the order of the submitted request instead of the existing persisted object

/priority important-soon

@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Jan 14, 2022
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cli Categorizes an issue or PR as relevant to SIG CLI. labels Jan 14, 2022
@k8s-ci-robot k8s-ci-robot added sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/storage Categorizes an issue or PR as relevant to SIG Storage. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jan 14, 2022
@jiahuif
Copy link
Member Author

jiahuif commented Jan 14, 2022

/kind feature
/sig api-machinery

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jan 14, 2022
@jiahuif
fix containers order after applying
ead7dd5 
to be appending instead of prepending.
@k8s-ci-robot k8s-ci-robot added area/test sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jan 14, 2022
@jiahuif
Copy link
Member Author

jiahuif commented Jan 14, 2022

Could you take a look at the backports too?
/assign @apelisse @liggitt

@liggitt
Copy link
Member

liggitt commented Jan 14, 2022

/lgtm
/approve

@liggitt liggitt closed this Jan 14, 2022
@jiahuif
Copy link
Member Author

jiahuif commented Jan 14, 2022

This is for 1.21, did you intend to close the one for 1.20 instead?

@liggitt liggitt reopened this Jan 14, 2022
@apelisse
Copy link
Member

Yeah, I was going to mention that :-)

@liggitt
Copy link
Member

liggitt commented Jan 14, 2022

sigh, clicked "close with comment" instead of "comment"

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jiahuif, liggitt

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 14, 2022
@jiahuif
Copy link
Member Author

jiahuif commented Jan 14, 2022 •
edited

We intend to backport the fix for #104641 to 1.23, 1.22, and 1.21, omitting 1.20. Could you take a look?
/cc @kubernetes/release-managers
/cc @cpanato

@k8s-ci-robot k8s-ci-robot requested review from cpanato and a team January 14, 2022 21:33
@jiahuif
Copy link
Member Author

jiahuif commented Jan 14, 2022

/retest

@apelisse
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 15, 2022
@puerco
Copy link
Member

puerco commented Jan 15, 2022

Thank you @jiahuif
/lgtm

@puerco puerco added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jan 15, 2022
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jan 15, 2022
@k8s-ci-robot k8s-ci-robot merged commit 80b625c into kubernetes:release-1.21 Jan 15, 2022
@jiahuif jiahuif deleted the automated-cherry-pick-of-#107565-upstream-release-1.21 branch January 15, 2022 20:35
@fedebongio
Copy link
Contributor

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jan 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alculquicondor alculquicondor Awaiting requested review from alculquicondor

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@cpanato cpanato Awaiting requested review from cpanato

Assignees

@liggitt liggitt

@apelisse apelisse

@puerco puerco

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/cloudprovider area/code-generation area/dependency Issues or PRs related to dependency changes area/kubectl area/test cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@jiahuif @liggitt @apelisse @k8s-ci-robot @puerco @fedebongio