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

Delete nodes if the GCE instance id changes and pods bound to the deleted node #368

Merged
merged 2 commits into from
Sep 23, 2022

Conversation

CoderSherlock
Copy link
Contributor

After node's preemption, pods bound to the deleted node may not finish termination and will be in failed phase stays in the pod list. Especially in preemptible VMs, graceful shutdown (30 seconds) can meet the requirement to clean pods on time.

@bobbypage and I worked on cleaning pods bound to the old node when the new node is registered. Our code checks nodes with obsolete GCE instance id, list all pods bound to it, and delete these pods.

@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Sep 2, 2022

CLA Signed

The committers listed above are authorized under a signed CLA.

  • ✅ login: bobbypage / name: David Porter (a4c9303)
  • ✅ login: CoderSherlock / name: Jon Hao (a746517)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Sep 2, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @CoderSherlock!

It looks like this is your first PR to kubernetes/cloud-provider-gcp 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/cloud-provider-gcp has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 2, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @CoderSherlock. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 2, 2022
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Sep 2, 2022
@bobbypage
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 2, 2022
@CoderSherlock
Copy link
Contributor Author

/retest

Copy link
Member

@bobbypage bobbypage left a comment

Choose a reason for hiding this comment

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

Thanks for working on this! Left a few minor comments

cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
@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 12, 2022
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 12, 2022
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 12, 2022
@k8s-ci-robot k8s-ci-robot added sig/network Categorizes an issue or PR as relevant to SIG Network. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 12, 2022
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 12, 2022
@CoderSherlock CoderSherlock changed the title Clean pods bound to the deleted node after node's preemption Clean nodes if the GCE instance id changes and pods bound to the deleted node Sep 12, 2022
@CoderSherlock CoderSherlock changed the title Clean nodes if the GCE instance id changes and pods bound to the deleted node Delete nodes if the GCE instance id changes and pods bound to the deleted node Sep 12, 2022
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
@@ -844,6 +861,22 @@ func shouldDeleteNode(ctx *controllerContext, node *v1.Node, getInstance func(*c
klog.Errorf("Error retrieving instance %q: %v", node.Name, err)
return false, err
}

if inst != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

can inst be nil if err was not nil, is this check unnecessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point! Didn't see any possible where inst and err could be both nil... Except in one of the unit test, I have tweaked that test case and mentioned you there. Thanks for addressing this.

cmd/gcp-controller-manager/node_csr_approver.go Outdated Show resolved Hide resolved
Added extra pod deletion to avoid old pods when pod gc controller not active

Added testcase to test if a node should be deleted if the GCE instance ID changes
@@ -1189,6 +1189,7 @@ func TestShouldDeleteNode(t *testing.T) {
Name: "node-test",
},
},
instance: &compute.Instance{},
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@vinayakankugoyal Added an empty instance in this mock test case, without this instance, inst and err are both nil in unit test.

@@ -844,6 +861,22 @@ func shouldDeleteNode(ctx *controllerContext, node *v1.Node, getInstance func(*c
klog.Errorf("Error retrieving instance %q: %v", node.Name, err)
return false, err
}

if inst != nil {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point! Didn't see any possible where inst and err could be both nil... Except in one of the unit test, I have tweaked that test case and mentioned you there. Thanks for addressing this.

@vinayakankugoyal
Copy link
Contributor

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CoderSherlock, vinayakankugoyal

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 23, 2022
@k8s-ci-robot k8s-ci-robot merged commit 6b0bfe2 into kubernetes:master Sep 23, 2022
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. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. sig/network Categorizes an issue or PR as relevant to SIG Network. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants