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 #117792: kubeadm: Use internal etcd client through an interface #117724: kubeadm: Make etcd member removal idempotent #117948

Merged
merged 3 commits into from Jun 6, 2023
Merged

Automated cherry pick of #117792: kubeadm: Use internal etcd client through an interface #117724: kubeadm: Make etcd member removal idempotent #117948

merged 3 commits into from Jun 6, 2023

Conversation

dlipovetsky
Copy link
Contributor

@dlipovetsky dlipovetsky commented May 11, 2023 •
edited by k8s-ci-robot

Cherry pick of #117792 #117724 on release-1.27.

#117792: kubeadm: Use internal etcd client through an interface
#117724: kubeadm: Make etcd member removal idempotent

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

If `kubeadm reset` finds no etcd member ID for the peer it removes during the `remove-etcd-member` phase, it continues immediately to other phases, instead of retrying the phase for up to 3 minutes before continuing.

@dlipovetsky
kubeadm: Use internal etcd client through an interface
38bbd2d
@dlipovetsky
kubeadm: Add etcd client unit tests
a64d660
@dlipovetsky
kubeadm: Make etcd member removal idempotent
0d5eb41 
If the etcd member is not found, then it has already been removed, and
kubeadm reset should immediately complete the 'remove-etcd-member'
phase. Previously, the phase would complete only once the
exponential-backoff retry expired, up to 3 minutes duration.

This commit also fixes a semantic error in etcd.GetMemberID. Previously,
the function returned 0 if no member was found, but 0 is not a valid
member ID.
@k8s-ci-robot k8s-ci-robot added this to the v1.27 milestone May 11, 2023
@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. labels May 11, 2023
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels May 11, 2023
@dlipovetsky dlipovetsky mentioned this pull request May 11, 2023
Merged
@SataQiu
Copy link
Member

SataQiu commented May 12, 2023

Thanks @dlipovetsky
Do we really need to cherry-pick the unit tests code(#117792) to the old releases?
And, I suggest wait #117919 to be merged first, and merge it into this cherry-pick together.

@SataQiu
Copy link
Member

SataQiu commented May 12, 2023

/cc @pacoxu @neolit123

@pacoxu
Copy link
Member

pacoxu commented May 12, 2023

/lgtm
/assign @neolit123 @SataQiu

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 12, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 65b0c7e27ec8ab3a7efd6ad97199d8d48908aa61

@pacoxu
Copy link
Member

pacoxu commented May 12, 2023 •
edited

Do we really need to cherry-pick the unit tests code(#117792) to the old releases?

If the ut and the fix are as a whole, I think the cherry-pick is acceptable.

@neolit123
Copy link
Member

cherry picking the unit tests to old releases is ok as it ensures the change works there.

LGTM

neolit123
neolit123 reviewed May 12, 2023
View reviewed changes
Copy link
Member

@neolit123 neolit123 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 k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 12, 2023
@xmudrii
Copy link
Member

xmudrii commented May 12, 2023

Is this only needed for 1.27 and 1.26?

@SataQiu
Copy link
Member

SataQiu commented May 15, 2023

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels May 15, 2023
@neolit123
Copy link
Member

/release-note-edit

If `kubeadm reset` finds no etcd member ID for the peer it removes during the `remove-etcd-member` phase, it continues immediately to other phases, instead of retrying the phase for up to 3 minutes before continuing.

@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 May 15, 2023
@dlipovetsky
Copy link
Contributor Author

xmud

Good catch. I also cherry-picked to 1.25: #118057

@pacoxu
Copy link
Member

pacoxu commented May 23, 2023

/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team May 23, 2023 02:58
xmudrii
xmudrii approved these changes Jun 6, 2023
View reviewed changes
Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

For RelEng:
/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dlipovetsky, neolit123, xmudrii

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

@xmudrii xmudrii added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 6, 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 Jun 6, 2023
@k8s-ci-robot k8s-ci-robot merged commit 5e00018 into kubernetes:release-1.27 Jun 6, 2023
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neolit123 neolit123 neolit123 left review comments

@xmudrii xmudrii xmudrii approved these changes

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

@SataQiu SataQiu Awaiting requested review from SataQiu

@pacoxu pacoxu Awaiting requested review from pacoxu

Assignees

@neolit123 neolit123

@pacoxu pacoxu

@SataQiu SataQiu

@xmudrii xmudrii

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
[sig-release] Bug Triage
Archived in project
Milestone
v1.27
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@dlipovetsky @k8s-ci-robot @SataQiu @pacoxu @neolit123 @xmudrii