Merge pull request #16572 from HealthengineAU/update-nth

Upgrade node-termination-handler to 1.22.0

k8s/crds/kops.k8s.io_clusters.yaml

@@ -5799,6 +5799,12 @@ spec:
                       Default: 50m
                     pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                     x-kubernetes-int-or-string: true
+                  deleteSQSMsgIfNodeNotFound:
+                    description: |-
+                      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
+                    type: boolean
                   enableRebalanceDraining:
                     description: |-
                       EnableRebalanceDraining makes node termination handler drain nodes when the rebalance recommendation notice is received.
@@ -5843,6 +5849,15 @@ spec:
                       This field has kept its name even though it now maps to the --managed-tag flag due to keeping the API stable.
                       Node termination handler does no longer check the ASG for this tag, but the actual EC2 instances.
                     type: string
+                  memoryLimit:
+                    anyOf:
+                    - type: integer
+                    - type: string
+                    description: |-
+                      MemoryLimit of NodeTerminationHandler container.
+                      Default: none
+                    pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
+                    x-kubernetes-int-or-string: true
                   memoryRequest:
                     anyOf:
                     - type: integer
@@ -5852,14 +5867,29 @@ spec:
                       Default: 64Mi
                     pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                     x-kubernetes-int-or-string: true
+                  podTerminationGracePeriod:
+                    description: |-
+                      PodTerminationGracePeriod is the time in seconds given to each pod to terminate gracefully.
+                      If negative, the default value specified in the pod will be used, which defaults to 30 seconds if not specified for the pod.
+                      Default: -1
+                    format: int32
+                    type: integer
                   prometheusEnable:
                     description: |-
                       EnablePrometheusMetrics enables the "/metrics" endpoint.
                       Default: false
                     type: boolean
+                  taintNode:
+                    description: |-
+                      TaintNode makes node termination handler taint nodes when an interruption event occurs.
+                      Default: false
+                    type: boolean
                   version:
                     description: Version is the container image tag used.
                     type: string
+                  webhookTemplate:
+                    description: Replaces the default webhook message template.
+                    type: string
                   webhookURL:
                     description: If specified, posts event data to URL upon instance
                       interruption action.

pkg/apis/kops/componentconfig.go

@@ -963,6 +963,10 @@ type SnapshotControllerConfig struct {
 
 // NodeTerminationHandlerSpec determines the node termination handler configuration.
 type NodeTerminationHandlerSpec struct {
+	// 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"`
 	// Enabled enables the node termination handler.
 	// Default: true
 	Enabled *bool `json:"enabled,omitempty"`
@@ -999,6 +1003,18 @@ type NodeTerminationHandlerSpec struct {
 	// Node termination handler does no longer check the ASG for this tag, but the actual EC2 instances.
 	ManagedASGTag *string `json:"managedASGTag,omitempty"`
 
+	// PodTerminationGracePeriod is the time in seconds given to each pod to terminate gracefully.
+	// If negative, the default value specified in the pod will be used, which defaults to 30 seconds if not specified for the pod.
+	// Default: -1
+	PodTerminationGracePeriod *int32 `json:"podTerminationGracePeriod,omitempty"`
+
+	// TaintNode makes node termination handler taint nodes when an interruption event occurs.
+	// Default: false
+	TaintNode *bool `json:"taintNode,omitempty"`
+
+	// MemoryLimit of NodeTerminationHandler container.
+	// Default: none
+	MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
 	// MemoryRequest of NodeTerminationHandler container.
 	// Default: 64Mi
 	MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
@@ -1008,6 +1024,8 @@ type NodeTerminationHandlerSpec struct {
 	// Version is the container image tag used.
 	Version *string `json:"version,omitempty"`
 
+	// Replaces the default webhook message template.
+	WebhookTemplate *string `json:"webhookTemplate,omitempty"`
 	// If specified, posts event data to URL upon instance interruption action.
 	WebhookURL *string `json:"webhookURL,omitempty"`
 }

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -1030,6 +1030,10 @@ type SnapshotControllerConfig struct {
 
 // NodeTerminationHandlerSpec determines the node termination handler configuration.
 type NodeTerminationHandlerSpec struct {
+	// 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"`
 	// Enabled enables the node termination handler.
 	// Default: true
 	Enabled *bool `json:"enabled,omitempty"`
@@ -1066,6 +1070,18 @@ type NodeTerminationHandlerSpec struct {
 	// Node termination handler does no longer check the ASG for this tag, but the actual EC2 instances.
 	ManagedASGTag *string `json:"managedASGTag,omitempty"`
 
+	// PodTerminationGracePeriod is the time in seconds given to each pod to terminate gracefully.
+	// If negative, the default value specified in the pod will be used, which defaults to 30 seconds if not specified for the pod.
+	// Default: -1
+	PodTerminationGracePeriod *int32 `json:"podTerminationGracePeriod,omitempty"`
+
+	// TaintNode makes node termination handler taint nodes when an interruption event occurs.
+	// Default: false
+	TaintNode *bool `json:"taintNode,omitempty"`
+
+	// MemoryLimit of NodeTerminationHandler container.
+	// Default: none
+	MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
 	// MemoryRequest of NodeTerminationHandler container.
 	// Default: 64Mi
 	MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
@@ -1075,6 +1091,8 @@ type NodeTerminationHandlerSpec struct {
 	// Version is the container image tag used.
 	Version *string `json:"version,omitempty"`
 
+	// Replaces the default webhook message template.
+	WebhookTemplate *string `json:"webhookTemplate,omitempty"`
 	// If specified, posts event data to URL upon instance interruption action.
 	WebhookURL *string `json:"webhookURL,omitempty"`
 }

pkg/apis/kops/v1alpha3/componentconfig.go

@@ -959,6 +959,10 @@ type SnapshotControllerConfig struct {
 
 // NodeTerminationHandlerSpec determines the node termination handler configuration.
 type NodeTerminationHandlerSpec struct {
+	// 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"`
 	// Enabled enables the node termination handler.
 	// Default: true
 	Enabled *bool `json:"enabled,omitempty"`
@@ -995,6 +999,18 @@ type NodeTerminationHandlerSpec struct {
 	// Default: true
 	ExcludeFromLoadBalancers *bool `json:"excludeFromLoadBalancers,omitempty"`
 
+	// PodTerminationGracePeriod is the time in seconds given to each pod to terminate gracefully.
+	// If negative, the default value specified in the pod will be used, which defaults to 30 seconds if not specified for the pod.
+	// Default: -1
+	PodTerminationGracePeriod *int32 `json:"podTerminationGracePeriod,omitempty"`
+
+	// TaintNode makes node termination handler taint nodes when an interruption event occurs.
+	// Default: false
+	TaintNode *bool `json:"taintNode,omitempty"`
+
+	// MemoryLimit of NodeTerminationHandler container.
+	// Default: none
+	MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
 	// MemoryRequest of NodeTerminationHandler container.
 	// Default: 64Mi
 	MemoryRequest *resource.Quantity `json:"memoryRequest,omitempty"`
@@ -1004,6 +1020,8 @@ type NodeTerminationHandlerSpec struct {
 	// Version is the container image tag used.
 	Version *string `json:"version,omitempty"`
 
+	// Replaces the default webhook message template.
+	WebhookTemplate *string `json:"webhookTemplate,omitempty"`
 	// If specified, posts event data to URL upon instance interruption action.
 	WebhookURL *string `json:"webhookURL,omitempty"`
 }