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.

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

Automated cherry pick of #112737: StatefulSet: Cleanup the complex defer function updating the #113726

Merged
merged 1 commit into from Feb 10, 2023
Merged

Automated cherry pick of #112737: StatefulSet: Cleanup the complex defer function updating the #113726

merged 1 commit into from Feb 10, 2023

Conversation

gjkim42
Copy link
Member

@gjkim42 gjkim42 commented Nov 8, 2022 •
edited

Cherry pick of #112737 on release-1.25.

#112737: StatefulSet: Cleanup the complex defer function updating the

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

NOTE:
#112737 alone does not deserve to be cherry-picked but we are trying to cherry-pick #112737 in release-1.23 and release-1.24 to complement #109694. And we don't want release-1.25 to be behind release-1.24 and release-1.23.

NONE

@gjkim42
StatefulSet: Cleanup the complex defer function updating the status
d0afb30 
In the long term, the complex defer function makes the code harder to
maintain as code after it should take that into account. This removes
the complex defer function updating the status of a statefulset.
@k8s-ci-robot k8s-ci-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Nov 8, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone Nov 8, 2022
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. 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. labels Nov 8, 2022
@k8s-ci-robot k8s-ci-robot added sig/apps Categorizes an issue or PR as relevant to SIG Apps. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 8, 2022
@gjkim42
Copy link
Member Author

gjkim42 commented Nov 8, 2022

@soltysh @atiratree

NOTE:
#112737 alone does not deserve to be cherry-picked but we are trying to cherry-pick #112737 in release-1.23 and release-1.24 to complement #109694. And we don't want release-1.25 to be behind release-1.24 and release-1.23.

Could you take a look at this as well?

@gjkim42
Copy link
Member Author

gjkim42 commented Nov 8, 2022

/retest-required

@aojea
Copy link
Member

aojea commented Nov 8, 2022

/hold

the tests added with this PR are flaking in master, we should verify this is not going to regress

#113036

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 8, 2022
@atiratree
Copy link
Member

The flaking tests were added by a different PR (#112127) for daemon sets. This PR should be ok, but yes we should wait with backporting for some time to see that this does not cause any regressions

@atiratree
Copy link
Member

we can proceed here, as the code seems to be stable
/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 3, 2023
@atiratree
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 3, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 87532dca087726b9607e1803fe1527c6e7dbf376

@atiratree
Copy link
Member

@gjkim42 can you please fix the release note?

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jan 3, 2023
@gjkim42
Copy link
Member Author

gjkim42 commented Jan 3, 2023

@gjkim42 can you please fix the release note?

/release-note-none

#112737 alone does not deserve to be cherry-picked but we are trying to cherry-pick #112737 in release-1.23 and release-1.24 to complement #109694. And we don't want release-1.25 to be behind release-1.24 and release-1.23.

This PR doesn't really change any behavior.
We should have added a release note in #109694 which has already been merged in v1.25.0.

Maybe we can manually add a release note to https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.25.md (and backport it again...?) but I am not sure we really want to make that call.

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Jan 3, 2023
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Jan 3, 2023
@atiratree
Copy link
Member

none release note sounds fine. Nevertheless, the release-note-none label seems deprecated. Can you please update the description instead?

@gjkim42
Copy link
Member Author

gjkim42 commented Jan 3, 2023

none release note sounds fine. Nevertheless, the release-note-none label seems deprecated. Can you please update the description instead?

done!

soltysh
soltysh approved these changes Jan 4, 2023
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gjkim42, soltysh

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 4, 2023
@soltysh
Copy link
Contributor

soltysh commented Jan 4, 2023

/triage accepted
/priority important-longterm
/kind bug

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. kind/bug Categorizes issue or PR as related to a bug. and removed 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. labels Jan 4, 2023
@gjkim42
Copy link
Member Author

gjkim42 commented Jan 5, 2023

/cc @kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team January 5, 2023 11:47
@Shubham82 Shubham82 mentioned this pull request Jan 12, 2023
Closed
@Verolop
Copy link

Verolop commented Feb 10, 2023

/lgtm

@Verolop Verolop added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 10, 2023
@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 Feb 10, 2023
@Verolop
Copy link

Verolop commented Feb 10, 2023

/test pull-kubernetes-e2e-kind-ipv6

@k8s-ci-robot k8s-ci-robot merged commit 3ffa023 into kubernetes:release-1.25 Feb 10, 2023
@gjkim42 gjkim42 deleted the automated-cherry-pick-of-#112737-upstream-release-1.25 branch February 11, 2023 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soltysh soltysh soltysh approved these changes

@kow3ns kow3ns Awaiting requested review from kow3ns

Assignees

@Verolop Verolop

@atiratree atiratree

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/bug Categorizes issue or PR as related to a bug. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note-none Denotes a PR that doesn't merit a release note. sig/apps Categorizes an issue or PR as relevant to SIG Apps. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@gjkim42 @aojea @atiratree @k8s-ci-robot @soltysh @Verolop