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

[release-1.8] 🐛 KCP: remove etcd member in pre-terminate hook #11136

Merged

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Sep 5, 2024

What this PR does / why we need it:
Manual cherry-pick of #11137

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot k8s-ci-robot added this to the v1.8 milestone Sep 5, 2024
@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 5, 2024
@k8s-ci-robot k8s-ci-robot added do-not-merge/needs-area PR is missing an area label size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 5, 2024
@sbueringer sbueringer changed the title [WIP] 🐛 KCP: remove etcd member in pre-terminate hook [WIP] [release-1.8] 🐛 KCP: remove etcd member in pre-terminate hook Sep 5, 2024
@sbueringer sbueringer force-pushed the pr-kcp-pre-terminate-1.8 branch 2 times, most recently from 2775798 to 8295a4c Compare September 5, 2024 06:06
@kubernetes-sigs kubernetes-sigs deleted a comment from k8s-ci-robot Sep 5, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-release-1-8
/test pull-cluster-api-e2e-conformance-release-1-8
/test pull-cluster-api-e2e-mink8s-release-1-8
/test pull-cluster-api-e2e-release-1-8
/test pull-cluster-api-e2e-upgrade-1-30-1-31-release-1-8

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 5, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-release-1-8
/test pull-cluster-api-e2e-conformance-release-1-8
/test pull-cluster-api-e2e-mink8s-release-1-8
/test pull-cluster-api-e2e-release-1-8
/test pull-cluster-api-e2e-upgrade-1-30-1-31-release-1-8

@k8s-ci-robot k8s-ci-robot removed the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 5, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-release-1-8
/test pull-cluster-api-e2e-conformance-release-1-8
/test pull-cluster-api-e2e-mink8s-release-1-8
/test pull-cluster-api-e2e-release-1-8
/test pull-cluster-api-e2e-upgrade-1-30-1-31-release-1-8

@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Sep 5, 2024
@sbueringer sbueringer added the area/provider/control-plane-kubeadm Issues or PRs related to KCP label Sep 5, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-area PR is missing an area label label Sep 5, 2024
@sbueringer sbueringer changed the title [WIP] [release-1.8] 🐛 KCP: remove etcd member in pre-terminate hook [release-1.8] 🐛 KCP: remove etcd member in pre-terminate hook Sep 5, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 5, 2024
@sbueringer
Copy link
Member Author

sbueringer commented Sep 5, 2024

This PR is a squashed cherry-pick of #11137 as of now

/hold

until #11137 is merged

@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 5, 2024
@sbueringer sbueringer added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Sep 5, 2024
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-conformance-ci-latest-release-1-8
/test pull-cluster-api-e2e-conformance-release-1-8
/test pull-cluster-api-e2e-mink8s-release-1-8
/test pull-cluster-api-e2e-release-1-8
/test pull-cluster-api-e2e-upgrade-1-30-1-31-release-1-8

@chrischdi
Copy link
Member

/lgtm
/approve

Compared the diffs

git diff origin/main...sbueringer/pr-kcp-pre-terminate > diff-main.diff
git diff origin/release-1.8...sbueringer/pr-kcp-pre-terminate-1.8 > diff-1.8.diff
diff  diff-1.8.diff diff-main.diff

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

LGTM label has been added.

Git tree hash: 6ddafb77e3e81ad0aae5c155f45faa7b4b7e6546

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 Sep 5, 2024
@sbueringer sbueringer mentioned this pull request Sep 5, 2024
@sbueringer
Copy link
Member Author

/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 Sep 5, 2024
@sbueringer
Copy link
Member Author

sbueringer commented Sep 5, 2024

/override pull-cluster-api-e2e-blocking-release-1-8

No need to retest before merge. We only merged a doc PR in between

@k8s-ci-robot
Copy link
Contributor

@sbueringer: Overrode contexts on behalf of sbueringer: pull-cluster-api-e2e-blocking-release-1-8

In response to this:

/override pull-cluster-api-e2e-blocking-release-1-8

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.

@k8s-ci-robot k8s-ci-robot merged commit b772261 into kubernetes-sigs:release-1.8 Sep 5, 2024
26 checks passed
@sbueringer sbueringer deleted the pr-kcp-pre-terminate-1.8 branch September 5, 2024 16:22
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. area/provider/control-plane-kubeadm Issues or PRs related to KCP cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants