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

Upgrade node-termination-handler to 1.22.0 #16572

Merged
merged 2 commits into from
May 16, 2024
Merged

Upgrade node-termination-handler to 1.22.0 #16572

merged 2 commits into from
May 16, 2024

Conversation

jim-barber-he
Copy link
Contributor

Also allow to specify the following extra parameters for it.

  • deleteSqsMsgIfNodeNotFound
  • memoryLimit
  • podTerminationGracePeriod
  • taintNode
  • webhookTemplate

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 15, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @jim-barber-he. 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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 15, 2024
@jim-barber-he
Copy link
Contributor Author

I've created 2 commits so that you can see my changes in the first one, then the 2nd one has 209 test files updated from running hack/update-expected.sh
I'm happy to squash these commits together and force push at the end if you like.

@jim-barber-he
Copy link
Contributor Author

jim-barber-he commented May 15, 2024 •
edited

Node Termination Handler v1.22.0 was released a moment ago.
https://github.com/aws/aws-node-termination-handler/releases/tag/v1.22.0

There are no changes to the helm charts apart from bumping the version, so I may as well change this to use it.

@jim-barber-he jim-barber-he changed the title Upgrade node-termination-handler to 1.21.0 Upgrade node-termination-handler to 1.22.0 May 16, 2024
@hakman
Copy link
Member

hakman commented May 16, 2024

/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 May 16, 2024
hakman
hakman requested changes May 16, 2024
View reviewed changes
pkg/apis/kops/componentconfig.go Outdated
// DeleteSqsMsgIfNodeNotFound makes node termination handler delete the SQS Message from the SQS Queue if the targeted node is not found.
// Only used in Queue Processor mode.
// Default: false
DeleteSqsMsgIfNodeNotFound *bool `json:"deleteSqsMsgIfNodeNotFound,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

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

SQS should be in uppercase.

Suggested change
DeleteSqsMsgIfNodeNotFound *bool `json:"deleteSqsMsgIfNodeNotFound,omitempty"`
DeleteSQSMsgIfNodeNotFound *bool `json:"deleteSQSMsgIfNodeNotFound,omitempty"`

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@jim-barber-he
Upgrade node-termination-handler to 1.22.0
f48add0 
Also allow to specify the following extra parameters for it.
- deleteSqsMsgIfNodeNotFound
- memoryLimit
- podTerminationGracePeriod
- taintNode
- webhookTemplate

Signed-off-by: Jim Barber <jim.barber@healthengine.com.au>
@jim-barber-he
Add results of hack/update-expected.sh
5fe5174 
Signed-off-by: Jim Barber <jim.barber@healthengine.com.au>
@jim-barber-he jim-barber-he requested a review from hakman May 16, 2024 04:51
hakman
hakman approved these changes May 16, 2024
View reviewed changes
Copy link
Member

@hakman hakman left a comment

Choose a reason for hiding this comment

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

Thanks @jim-barber-he! 👍

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 May 16, 2024
@jim-barber-he
Copy link
Contributor Author

Do you need/want the 2x commits squashed into 1?

@hakman
Copy link
Member

hakman commented May 16, 2024

Do you need/want the 2x commits squashed into 1?

Nop, all good. Thanks!

@k8s-ci-robot k8s-ci-robot merged commit a4b9980 into kubernetes:master May 16, 2024
22 of 23 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.30 milestone May 16, 2024
@jim-barber-he jim-barber-he deleted the update-nth branch May 16, 2024 05:47
@jim-barber-he
Copy link
Contributor Author

@hakman Will this be in the next kops 1.29 release?
If not planned, are you okay if I raise a PR to cherry-pick it into 1.29?

@hakman
Copy link
Member

hakman commented May 30, 2024

@jim-barber-he Sure, I don't see any issue with that. Thanks!

@jim-barber-he jim-barber-he mentioned this pull request May 31, 2024
Merged
@jim-barber-he
Copy link
Contributor Author

jim-barber-he commented May 31, 2024 •
edited

Thanks @hakman
The PR is here:
#16595

k8s-ci-robot added a commit that referenced this pull request May 31, 2024
@k8s-ci-robot
Merge pull request #16595 from HealthengineAU/automated-cherry-pick-o…
5b8e06d 
…f-#16572-upstream-release-1.29

Automated cherry pick of #16572: Upgrade node-termination-handler to 1.22.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hakman hakman hakman approved these changes

@johngmyers johngmyers Awaiting requested review from johngmyers

@zetaab zetaab Awaiting requested review from zetaab

Assignees

@hakman hakman

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons area/api 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.30
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jim-barber-he @k8s-ci-robot @hakman