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 #109694: Be sure to update the status of StatefulSet even if the new #112084

Merged
merged 3 commits into from Jan 11, 2023
Merged

Automated cherry pick of #109694: Be sure to update the status of StatefulSet even if the new #112084

merged 3 commits into from Jan 11, 2023

Conversation

gjkim42
Copy link
Member

@gjkim42 gjkim42 commented Aug 27, 2022 •
edited

ref: #112010

Cherry pick of #109694 #112737 on release-1.23.

#109694: Be sure to update the status of StatefulSet even if the new
#112737: StatefulSet: Cleanup the complex defer function updating the

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

Fixed StatefulSet to show the valid status even if the new replica creation fails.

@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Aug 27, 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/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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 Aug 27, 2022
@k8s-ci-robot k8s-ci-robot added area/test sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Aug 27, 2022
@gjkim42
Copy link
Member Author

gjkim42 commented Aug 27, 2022

/retest

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Aug 30, 2022
@soltysh
Copy link
Contributor

soltysh commented Sep 26, 2022

/hold
see https://github.com/kubernetes/kubernetes/pull/109694/files#r979974744

@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 Sep 26, 2022
RyanAoh and others added 2 commits November 8, 2022 20:48
@RyanAoh @gjkim42
Be sure to update the status of StatefulSet even if the new replica c…
d737324 
…reation fails
@gjkim42
StatefulSet: Cleanup the complex defer function updating the status
65beed7 
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.
@gjkim42 gjkim42 force-pushed the automated-cherry-pick-of-#109694-upstream-release-1.23 branch from 23e0e5d to 65beed7 Compare November 8, 2022 11:48
@gjkim42
Copy link
Member Author

gjkim42 commented Nov 8, 2022

@soltysh @atiratree
cherry-picked #112737 to resolve #112084 (comment).

Could you PTAL?

@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

@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

retesting flakes
/retest

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

/lgtm
/approve

@soltysh
Copy link
Contributor

soltysh commented Jan 4, 2023

/triage accepted
/priority important-longterm
/kind bug

@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 lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 4, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 69ffc4d6c0b05c4356bb315fb5ae03872d6f49a8

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. do-not-merge/needs-kind Indicates a PR lacks a `kind/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
@Verolop
Copy link

Verolop commented Jan 11, 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 Jan 11, 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 Jan 11, 2023
@Verolop
Copy link

Verolop commented Jan 11, 2023

/test pull-kubernetes-integration

@k8s-ci-robot k8s-ci-robot merged commit 175142d into kubernetes:release-1.23 Jan 11, 2023
@gjkim42 gjkim42 deleted the automated-cherry-pick-of-#109694-upstream-release-1.23 branch January 11, 2023 22:02
@Shubham82 Shubham82 mentioned this pull request Jan 12, 2023
Closed
@mimowo mimowo mentioned this pull request Oct 2, 2023
Closed
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

@alculquicondor alculquicondor Awaiting requested review from alculquicondor

@neolit123 neolit123 Awaiting requested review from neolit123

Assignees

@soltysh soltysh

@Verolop Verolop

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/bug Categorizes issue or PR as related to a bug. 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 Denotes a PR that will be considered when it comes time to generate release notes. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/testing Categorizes an issue or PR as relevant to SIG Testing. 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.23
Development

Successfully merging this pull request may close these issues.

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