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

Add v1 Karpenter disrupted taint to pre-stop hook #2166

Merged
merged 1 commit into from
Oct 7, 2024

Conversation

AndrewSirenko
Copy link
Contributor

Is this a bug fix or adding new feature?
Bug fix

What is this PR about? / Why do we need it?
Fixes #2158

Our pre-stop hook attempts to keep the EBS CSI Driver node plugin alive while node is being drained so that it can Unstage/Unpublish all volumes and report that to Kubelet before node termination. Karpenter v1 changed their disruption taint, so we need to update our pre-stop hook to check for it.

We also remove the dependency on Karpenter because we are compatible with multiple versions of it, and switch to just checking taint key instead of taint key and effect in case these auto-scalars switch to a NoExecute effect.

What testing is done?
New unit tests.

TODO test with karpenter v1.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 3, 2024
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Oct 3, 2024
Copy link

github-actions bot commented Oct 3, 2024

Code Coverage Diff

File Old Coverage New Coverage Delta
github.com/kubernetes-sigs/aws-ebs-csi-driver/cmd/hooks/prestop.go 78.9% 81.1% 2.2

@AndrewSirenko
Copy link
Contributor Author

/retest

windows flake for volume expansion

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

@ConnorJC3 ConnorJC3 left a comment

Choose a reason for hiding this comment

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

One minor change otherwise lgtm

cmd/hooks/prestop.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 7, 2024
@AndrewSirenko AndrewSirenko force-pushed the update-pre-stop branch 2 times, most recently from b420df6 to 74319cd Compare October 7, 2024 18:31
Copy link
Contributor

@ConnorJC3 ConnorJC3 left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 7, 2024
@torredil
Copy link
Member

torredil commented Oct 7, 2024

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: torredil

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 Oct 7, 2024
@AndrewSirenko
Copy link
Contributor Author

/hold

@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 Oct 7, 2024
@ElijahQuinones
Copy link
Member

/retest

@AndrewSirenko
Copy link
Contributor Author

@ElijahQuinones Not a flake, need to reformat the module import

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 7, 2024
@AndrewSirenko
Copy link
Contributor Author

/unhold

@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 Oct 7, 2024
@ConnorJC3
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 7, 2024
@k8s-ci-robot k8s-ci-robot merged commit bd83db5 into kubernetes-sigs:master Oct 7, 2024
18 checks passed
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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

karpenter disruption taint isn't correct for karpenter v1
5 participants