diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index 68e6544d292e1..e62ce1ff1945a 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/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. diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go index 59603e913ea67..67f1abd7beb76 100644 --- a/pkg/apis/kops/componentconfig.go +++ b/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"` } diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go index b96c9134f225f..be02744976a5d 100644 --- a/pkg/apis/kops/v1alpha2/componentconfig.go +++ b/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"` } diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index 838d58239c0ef..ccbf677f9632f 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -6523,6 +6523,7 @@ func Convert_kops_NodeProblemDetectorConfig_To_v1alpha2_NodeProblemDetectorConfi } func autoConvert_v1alpha2_NodeTerminationHandlerSpec_To_kops_NodeTerminationHandlerSpec(in *NodeTerminationHandlerSpec, out *kops.NodeTerminationHandlerSpec, s conversion.Scope) error { + out.DeleteSQSMsgIfNodeNotFound = in.DeleteSQSMsgIfNodeNotFound out.Enabled = in.Enabled out.EnableSpotInterruptionDraining = in.EnableSpotInterruptionDraining out.EnableScheduledEventDraining = in.EnableScheduledEventDraining @@ -6532,9 +6533,13 @@ func autoConvert_v1alpha2_NodeTerminationHandlerSpec_To_kops_NodeTerminationHand out.EnableSQSTerminationDraining = in.EnableSQSTerminationDraining out.ExcludeFromLoadBalancers = in.ExcludeFromLoadBalancers out.ManagedASGTag = in.ManagedASGTag + out.PodTerminationGracePeriod = in.PodTerminationGracePeriod + out.TaintNode = in.TaintNode + out.MemoryLimit = in.MemoryLimit out.MemoryRequest = in.MemoryRequest out.CPURequest = in.CPURequest out.Version = in.Version + out.WebhookTemplate = in.WebhookTemplate out.WebhookURL = in.WebhookURL return nil } @@ -6545,6 +6550,7 @@ func Convert_v1alpha2_NodeTerminationHandlerSpec_To_kops_NodeTerminationHandlerS } func autoConvert_kops_NodeTerminationHandlerSpec_To_v1alpha2_NodeTerminationHandlerSpec(in *kops.NodeTerminationHandlerSpec, out *NodeTerminationHandlerSpec, s conversion.Scope) error { + out.DeleteSQSMsgIfNodeNotFound = in.DeleteSQSMsgIfNodeNotFound out.Enabled = in.Enabled out.EnableSpotInterruptionDraining = in.EnableSpotInterruptionDraining out.EnableScheduledEventDraining = in.EnableScheduledEventDraining @@ -6554,9 +6560,13 @@ func autoConvert_kops_NodeTerminationHandlerSpec_To_v1alpha2_NodeTerminationHand out.EnableSQSTerminationDraining = in.EnableSQSTerminationDraining out.ExcludeFromLoadBalancers = in.ExcludeFromLoadBalancers out.ManagedASGTag = in.ManagedASGTag + out.PodTerminationGracePeriod = in.PodTerminationGracePeriod + out.TaintNode = in.TaintNode + out.MemoryLimit = in.MemoryLimit out.MemoryRequest = in.MemoryRequest out.CPURequest = in.CPURequest out.Version = in.Version + out.WebhookTemplate = in.WebhookTemplate out.WebhookURL = in.WebhookURL return nil } diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index e5271a2fab4a1..b9394021bf7b5 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -4878,6 +4878,11 @@ func (in *NodeProblemDetectorConfig) DeepCopy() *NodeProblemDetectorConfig { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NodeTerminationHandlerSpec) DeepCopyInto(out *NodeTerminationHandlerSpec) { *out = *in + if in.DeleteSQSMsgIfNodeNotFound != nil { + in, out := &in.DeleteSQSMsgIfNodeNotFound, &out.DeleteSQSMsgIfNodeNotFound + *out = new(bool) + **out = **in + } if in.Enabled != nil { in, out := &in.Enabled, &out.Enabled *out = new(bool) @@ -4923,6 +4928,21 @@ func (in *NodeTerminationHandlerSpec) DeepCopyInto(out *NodeTerminationHandlerSp *out = new(string) **out = **in } + if in.PodTerminationGracePeriod != nil { + in, out := &in.PodTerminationGracePeriod, &out.PodTerminationGracePeriod + *out = new(int32) + **out = **in + } + if in.TaintNode != nil { + in, out := &in.TaintNode, &out.TaintNode + *out = new(bool) + **out = **in + } + if in.MemoryLimit != nil { + in, out := &in.MemoryLimit, &out.MemoryLimit + x := (*in).DeepCopy() + *out = &x + } if in.MemoryRequest != nil { in, out := &in.MemoryRequest, &out.MemoryRequest x := (*in).DeepCopy() @@ -4938,6 +4958,11 @@ func (in *NodeTerminationHandlerSpec) DeepCopyInto(out *NodeTerminationHandlerSp *out = new(string) **out = **in } + if in.WebhookTemplate != nil { + in, out := &in.WebhookTemplate, &out.WebhookTemplate + *out = new(string) + **out = **in + } if in.WebhookURL != nil { in, out := &in.WebhookURL, &out.WebhookURL *out = new(string) diff --git a/pkg/apis/kops/v1alpha3/componentconfig.go b/pkg/apis/kops/v1alpha3/componentconfig.go index 0e3bc0a3d6a69..3059eaea213b8 100644 --- a/pkg/apis/kops/v1alpha3/componentconfig.go +++ b/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"` } diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go index 784255d872503..04bf0009921f2 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go @@ -6778,6 +6778,7 @@ func Convert_kops_NodeProblemDetectorConfig_To_v1alpha3_NodeProblemDetectorConfi } func autoConvert_v1alpha3_NodeTerminationHandlerSpec_To_kops_NodeTerminationHandlerSpec(in *NodeTerminationHandlerSpec, out *kops.NodeTerminationHandlerSpec, s conversion.Scope) error { + out.DeleteSQSMsgIfNodeNotFound = in.DeleteSQSMsgIfNodeNotFound out.Enabled = in.Enabled out.EnableSpotInterruptionDraining = in.EnableSpotInterruptionDraining out.EnableScheduledEventDraining = in.EnableScheduledEventDraining @@ -6787,9 +6788,13 @@ func autoConvert_v1alpha3_NodeTerminationHandlerSpec_To_kops_NodeTerminationHand out.EnableSQSTerminationDraining = in.EnableSQSTerminationDraining out.ManagedASGTag = in.ManagedASGTag out.ExcludeFromLoadBalancers = in.ExcludeFromLoadBalancers + out.PodTerminationGracePeriod = in.PodTerminationGracePeriod + out.TaintNode = in.TaintNode + out.MemoryLimit = in.MemoryLimit out.MemoryRequest = in.MemoryRequest out.CPURequest = in.CPURequest out.Version = in.Version + out.WebhookTemplate = in.WebhookTemplate out.WebhookURL = in.WebhookURL return nil } @@ -6800,6 +6805,7 @@ func Convert_v1alpha3_NodeTerminationHandlerSpec_To_kops_NodeTerminationHandlerS } func autoConvert_kops_NodeTerminationHandlerSpec_To_v1alpha3_NodeTerminationHandlerSpec(in *kops.NodeTerminationHandlerSpec, out *NodeTerminationHandlerSpec, s conversion.Scope) error { + out.DeleteSQSMsgIfNodeNotFound = in.DeleteSQSMsgIfNodeNotFound out.Enabled = in.Enabled out.EnableSpotInterruptionDraining = in.EnableSpotInterruptionDraining out.EnableScheduledEventDraining = in.EnableScheduledEventDraining @@ -6809,9 +6815,13 @@ func autoConvert_kops_NodeTerminationHandlerSpec_To_v1alpha3_NodeTerminationHand out.EnableSQSTerminationDraining = in.EnableSQSTerminationDraining out.ExcludeFromLoadBalancers = in.ExcludeFromLoadBalancers out.ManagedASGTag = in.ManagedASGTag + out.PodTerminationGracePeriod = in.PodTerminationGracePeriod + out.TaintNode = in.TaintNode + out.MemoryLimit = in.MemoryLimit out.MemoryRequest = in.MemoryRequest out.CPURequest = in.CPURequest out.Version = in.Version + out.WebhookTemplate = in.WebhookTemplate out.WebhookURL = in.WebhookURL return nil } diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go index 6cdfd7e19f9df..a8653a09fc4a4 100644 --- a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go @@ -4772,6 +4772,11 @@ func (in *NodeProblemDetectorConfig) DeepCopy() *NodeProblemDetectorConfig { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NodeTerminationHandlerSpec) DeepCopyInto(out *NodeTerminationHandlerSpec) { *out = *in + if in.DeleteSQSMsgIfNodeNotFound != nil { + in, out := &in.DeleteSQSMsgIfNodeNotFound, &out.DeleteSQSMsgIfNodeNotFound + *out = new(bool) + **out = **in + } if in.Enabled != nil { in, out := &in.Enabled, &out.Enabled *out = new(bool) @@ -4817,6 +4822,21 @@ func (in *NodeTerminationHandlerSpec) DeepCopyInto(out *NodeTerminationHandlerSp *out = new(bool) **out = **in } + if in.PodTerminationGracePeriod != nil { + in, out := &in.PodTerminationGracePeriod, &out.PodTerminationGracePeriod + *out = new(int32) + **out = **in + } + if in.TaintNode != nil { + in, out := &in.TaintNode, &out.TaintNode + *out = new(bool) + **out = **in + } + if in.MemoryLimit != nil { + in, out := &in.MemoryLimit, &out.MemoryLimit + x := (*in).DeepCopy() + *out = &x + } if in.MemoryRequest != nil { in, out := &in.MemoryRequest, &out.MemoryRequest x := (*in).DeepCopy() @@ -4832,6 +4852,11 @@ func (in *NodeTerminationHandlerSpec) DeepCopyInto(out *NodeTerminationHandlerSp *out = new(string) **out = **in } + if in.WebhookTemplate != nil { + in, out := &in.WebhookTemplate, &out.WebhookTemplate + *out = new(string) + **out = **in + } if in.WebhookURL != nil { in, out := &in.WebhookURL, &out.WebhookURL *out = new(string) diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index 07406423818d2..0908541524fcd 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -4971,6 +4971,11 @@ func (in *NodeProblemDetectorConfig) DeepCopy() *NodeProblemDetectorConfig { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NodeTerminationHandlerSpec) DeepCopyInto(out *NodeTerminationHandlerSpec) { *out = *in + if in.DeleteSQSMsgIfNodeNotFound != nil { + in, out := &in.DeleteSQSMsgIfNodeNotFound, &out.DeleteSQSMsgIfNodeNotFound + *out = new(bool) + **out = **in + } if in.Enabled != nil { in, out := &in.Enabled, &out.Enabled *out = new(bool) @@ -5016,6 +5021,21 @@ func (in *NodeTerminationHandlerSpec) DeepCopyInto(out *NodeTerminationHandlerSp *out = new(string) **out = **in } + if in.PodTerminationGracePeriod != nil { + in, out := &in.PodTerminationGracePeriod, &out.PodTerminationGracePeriod + *out = new(int32) + **out = **in + } + if in.TaintNode != nil { + in, out := &in.TaintNode, &out.TaintNode + *out = new(bool) + **out = **in + } + if in.MemoryLimit != nil { + in, out := &in.MemoryLimit, &out.MemoryLimit + x := (*in).DeepCopy() + *out = &x + } if in.MemoryRequest != nil { in, out := &in.MemoryRequest, &out.MemoryRequest x := (*in).DeepCopy() @@ -5031,6 +5051,11 @@ func (in *NodeTerminationHandlerSpec) DeepCopyInto(out *NodeTerminationHandlerSp *out = new(string) **out = **in } + if in.WebhookTemplate != nil { + in, out := &in.WebhookTemplate, &out.WebhookTemplate + *out = new(string) + **out = **in + } if in.WebhookURL != nil { in, out := &in.WebhookURL, &out.WebhookURL *out = new(string) diff --git a/pkg/model/components/nodeterminationhandler.go b/pkg/model/components/nodeterminationhandler.go index 129d15b91d8ed..eaec602d72d05 100644 --- a/pkg/model/components/nodeterminationhandler.go +++ b/pkg/model/components/nodeterminationhandler.go @@ -39,6 +39,9 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o interface{}) error clusterSpec.CloudProvider.AWS.NodeTerminationHandler = &kops.NodeTerminationHandlerSpec{} } nth := clusterSpec.CloudProvider.AWS.NodeTerminationHandler + if nth.DeleteSQSMsgIfNodeNotFound == nil { + nth.DeleteSQSMsgIfNodeNotFound = fi.PtrTo(false) + } if nth.Enabled == nil { nth.Enabled = fi.PtrTo(true) } @@ -67,6 +70,14 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o interface{}) error nth.ManagedASGTag = fi.PtrTo("aws-node-termination-handler/managed") } + if nth.PodTerminationGracePeriod == nil { + nth.PodTerminationGracePeriod = fi.PtrTo(int32(-1)) + } + + if nth.TaintNode == nil { + nth.TaintNode = fi.PtrTo(false) + } + if nth.CPURequest == nil { defaultCPURequest := resource.MustParse("50m") nth.CPURequest = &defaultCPURequest @@ -78,7 +89,7 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o interface{}) error } if nth.Version == nil { - nth.Version = fi.PtrTo("v1.18.3") + nth.Version = fi.PtrTo("v1.22.0") } return nil diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content index 4ed62b059d0a0..48b926aa94276 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 85bcd6d9570c8124229981ec9bdd16fac9b4420e3fceca74a8884a25b15fc7a6 + manifestHash: 050bda24d1510b592d20c6d00963ff726050e0a208d09d6036aea1438f709de7 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 7bb0d15a6b8ec..b09b7da9fcf72 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_additionalobjects.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/additionalobjects-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content index fbafb0f1f9d05..c0bf118353e89 100644 --- a/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/additionalobjects.example.com/secrets diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content index bd9b3e36d0620..ebfdacdbfa4e2 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content @@ -185,6 +185,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -193,8 +194,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 489eada78cb00..2d1d0f342c620 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/apiservernodes/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content index 7236886b58185..a77c4c4853a46 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content @@ -195,6 +195,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -203,8 +204,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 1d1ba489a511b..d1be2c929eca5 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -97,7 +97,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: d866a5436fc9a285cbaefb8ffc8d5582a3239e563dda381f23f62482851fd489 + manifestHash: 09840259d2fc87e0f9704d14df71a803b21e5f9a65017929f4721eb191b53f70 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ac291e5e9b40a..da3a64de540e8 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -193,13 +193,15 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content index a52ab2e73b11a..07d45d7907b7e 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 11eeca8af35742efc852033436383112fa509a1701fdf5b4255a5914b2c2cab3 + manifestHash: 4fe566a2ea0f75659790f8b5a3959525a65d4db80753cafcadce1888d16890f1 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 62f47cdafc22d..bbbaebcbe3d39 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_bastionuserdata.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/bastionuserdata-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content index 5074127ad4d39..072e39ab304b5 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_cluster-completed.spec_content @@ -192,6 +192,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -200,8 +201,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/bastionuserdata.example.com/secrets diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content index 74f065cc918dd..278151a99106b 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: eadb4337be84c9287c574c2f1759b58d0050cb414487e92b204ceba9ab2b72e0 + manifestHash: e48b7872caff009a8f8c8201972d3c0a5b08ddcb3b9cdbefc2daea7aed53a2c2 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-node-termination-handler.aws-k8s-1.11_content index e3aa2528ac2f8..ea0681fe191d2 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cas-priority-expander-custom.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/cas-priority-expander-custom-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content index f8368bc09c942..5c4d03a2f30cf 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander-custom/data/aws_s3_object_cluster-completed.spec_content @@ -211,6 +211,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -219,8 +220,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/cas-priority-expander-custom.example.com/secrets diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content index 7096be3124720..fcce71907b35b 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 6c38974ac71212263abf762f9def698f23cb15bbd080dc65ff24ccd3aa87b621 + manifestHash: 0dde70f23ce66c64054ae801f3e2b01cad87318d03558c84502141fd0d1d6d63 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-node-termination-handler.aws-k8s-1.11_content index b44c09a948731..29a458c11171b 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cas-priority-expander.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/cas-priority-expander-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content index d9dfa62877ff1..ac9f2867898c3 100644 --- a/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/cluster-autoscaler-priority-expander/data/aws_s3_object_cluster-completed.spec_content @@ -204,6 +204,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -212,8 +213,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/cas-priority-expander.example.com/secrets diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content index 211a2580917be..843f55e43bdd9 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_cluster-completed.spec_content @@ -220,6 +220,7 @@ spec: - 10.20.30.0/24 nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -228,8 +229,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/complex.example.com/secrets diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content index 08ed651175327..947d6a249ca1a 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: a1f4481c1a51c222571da402ce760831a435acb55565ff3eaa6833743233d3fe + manifestHash: 93627ba43aa9bca83bd85005d328f2b42c28a9cf0cad1c03375fa4e33d59a877 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-node-termination-handler.aws-k8s-1.11_content index d3c470aa8844e..6f8bf4fed96a6 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_object_complex.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/complex-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content index f38a71b433b9f..c2f7e11a4441c 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_cluster-completed.spec_content @@ -190,6 +190,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -198,8 +199,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/compress.example.com/secrets diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content index 400c4e5091981..db99576746c7b 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 8a6fa7b6d7e58a9787fe977560ac5a665e6378e88db2fa9ecacad9af02afbe30 + manifestHash: 0b3fb4ed666addc5770f608553798dcd7801214cab1af4e863087528021abf0a name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 7182262008ea0..0b751f24d02ee 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_object_compress.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/compress-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content index b8d22d3e56f17..d2f5c4dd3f85b 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_cluster-completed.spec_content @@ -199,6 +199,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -207,8 +208,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/containerd.example.com/secrets diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content index ac81dc385ae44..2ad32f228d8a0 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: c7b1a78363bdc90729afd95a2a79531de23575917be79a08b53633a21a11d259 + manifestHash: 9109c82c750f803e727d65039759fb23350d7cf0c40b2f7a71e52275bfed29c8 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 38fd9f5464a01..6de17e25acc37 100644 --- a/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/containerd-custom/data/aws_s3_object_containerd.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/containerd-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content index 259215a829ba9..2ccdf57a22f23 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_cluster-completed.spec_content @@ -190,6 +190,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -198,8 +199,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/containerd.example.com/secrets diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content index ac81dc385ae44..2ad32f228d8a0 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: c7b1a78363bdc90729afd95a2a79531de23575917be79a08b53633a21a11d259 + manifestHash: 9109c82c750f803e727d65039759fb23350d7cf0c40b2f7a71e52275bfed29c8 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 38fd9f5464a01..6de17e25acc37 100644 --- a/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/containerd/data/aws_s3_object_containerd.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/containerd-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content index 722de4420d839..1f3b53ccf4e72 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: a09d53cbbf7a3ea2d99bb82be0ee59f6dbde13c4b6534a13f74ea9ae1b97d7b3 + manifestHash: f6892f2e8320ec33a8b65a3c7b09833656577210872dc458a886ad42395ef7b0 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 498ebc9990749..acb8ced6d51e2 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_123.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/123-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content index 07bcaf75040ff..7dc53df05a8e6 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_object_cluster-completed.spec_content @@ -212,6 +212,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -220,8 +221,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/123.example.com/secrets diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content index fe60f44412390..c41795e190b86 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_cluster-completed.spec_content @@ -198,6 +198,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -206,8 +207,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/existing-iam.example.com/secrets diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content index 80d942e723bcc..7e4f2b33229a6 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 78c9a5bef8a7c3db516ae6a5f1387cf261790bda6f0247cdd4ab99aa966bed78 + manifestHash: 78bb2c17b13c42199665b11062cb72d9fd3417a91fbf68db47d81943b3f1c9fe name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 42ac1bd8844c0..cdfb2f333de5b 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_object_existing-iam.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/existing-iam-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content index e7f18a5668a31..a89ddee43bc2d 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_cluster-completed.spec_content @@ -201,6 +201,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -209,8 +210,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/existingsg.example.com/secrets diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content index 36d8b521b9e13..5528b1a5376b8 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 9359292483bf8574b9bca0ef1e9b780b197971a1e0c47d48c5b3a38d63759754 + manifestHash: 04413ad35fe46b18a914e2aea240a9c00baec4ed8f46eacf04248c4b29b08823 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 52e3bef568008..b9c80592a627d 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_object_existingsg.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/existingsg-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content index 28c38e5477807..35ef5fbff14ff 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_cluster-completed.spec_content @@ -190,6 +190,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -198,8 +199,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 77c69c283ac5b..e1116c84d141e 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content index 0c044fd06f59b..fb34177859453 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -191,6 +191,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -199,8 +200,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 050e72282dcb7..50cf68f57cf95 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: d866a5436fc9a285cbaefb8ffc8d5582a3239e563dda381f23f62482851fd489 + manifestHash: 09840259d2fc87e0f9704d14df71a803b21e5f9a65017929f4721eb191b53f70 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ac291e5e9b40a..da3a64de540e8 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -193,13 +193,15 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content index 057362a8cf2b5..25a33518ef51b 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_cluster-completed.spec_content @@ -190,6 +190,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -198,8 +199,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/externallb.example.com/secrets diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content index 177794899c918..859bfcb10c36c 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 517eb861f38e98b314d924c03e15a6fdbd8aa645e613f7971354291e9e2ad808 + manifestHash: 63bc1b085a473c4b9fe8bde2fef87761d10c2a034b5b005f7b0312a8498552a2 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-node-termination-handler.aws-k8s-1.11_content index b0d9058a6d700..67e2b0b9eb558 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_object_externallb.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/externallb-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content index 25714e0d9b17f..ab65f163e2f78 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_cluster-completed.spec_content @@ -210,6 +210,7 @@ spec: - 10.20.30.0/24 nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -218,8 +219,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/externalpolicies.example.com/secrets diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content index c6a7ee42e3600..b29ef3515aeb1 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 55628f7c38b9cac312f4a5aa25c48a59099ddd74dab03f76d07faa12c8a2f905 + manifestHash: 1f4d26bc84436fd7ed82dd2192353b9820361e6fce514079f868e9a3a6d1bcb9 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 20e1482ade2eb..2757c220cebb1 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_object_externalpolicies.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/externalpolicies-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content index 905127668ebc5..1821ddb255019 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_cluster-completed.spec_content @@ -198,6 +198,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -206,8 +207,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/ha.example.com/secrets diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content index 10ca6190f3e06..c6de4769aac70 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: e33e9327d8e022733a1acd17a8fc9547f9a162bb760094f5f9d3d6ce8ce81b8e + manifestHash: c403c68b0f2673d41867a0feea138c6da69656fb6a4d3085a0a1ac77c58b0b6d name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-node-termination-handler.aws-k8s-1.11_content index b46cc9cd89cc9..ed3691ecfb167 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_object_ha.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/ha-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content index f9f715e6c3ca2..ee63db86fbd90 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_cluster-completed.spec_content @@ -219,6 +219,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -227,8 +228,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 podIdentityWebhook: diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 8a14b16e55713..ec7bc98aa17e8 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -97,7 +97,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content index c6742b4061659..a2c69e8bccd79 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_cluster-completed.spec_content @@ -199,6 +199,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -207,8 +208,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 1e198b25400f0..c3698b3bc0fef 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: d866a5436fc9a285cbaefb8ffc8d5582a3239e563dda381f23f62482851fd489 + manifestHash: 09840259d2fc87e0f9704d14df71a803b21e5f9a65017929f4721eb191b53f70 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ac291e5e9b40a..da3a64de540e8 100644 --- a/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -193,13 +193,15 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content index 8dfcb8018d22e..e7e46942e9caf 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -214,6 +214,7 @@ spec: amazonvpc: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -222,8 +223,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index f376ad5b7130a..0d84f09e7c36c 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -112,7 +112,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: d866a5436fc9a285cbaefb8ffc8d5582a3239e563dda381f23f62482851fd489 + manifestHash: 09840259d2fc87e0f9704d14df71a803b21e5f9a65017929f4721eb191b53f70 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ac291e5e9b40a..da3a64de540e8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -193,13 +193,15 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content index fdee397870c4a..c1b8b21b296a9 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_cluster-completed.spec_content @@ -214,6 +214,7 @@ spec: amazonvpc: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -222,8 +223,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 406ca6b1f3fce..7158d3f2a235a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -119,7 +119,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: d866a5436fc9a285cbaefb8ffc8d5582a3239e563dda381f23f62482851fd489 + manifestHash: 09840259d2fc87e0f9704d14df71a803b21e5f9a65017929f4721eb191b53f70 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ac291e5e9b40a..da3a64de540e8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa25/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -193,13 +193,15 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content index 04956db414365..e7c36200516fa 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -221,6 +221,7 @@ spec: amazonvpc: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -229,8 +230,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index bed6d57f733f5..4dceac667eb7a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -120,7 +120,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: d866a5436fc9a285cbaefb8ffc8d5582a3239e563dda381f23f62482851fd489 + manifestHash: 09840259d2fc87e0f9704d14df71a803b21e5f9a65017929f4721eb191b53f70 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ac291e5e9b40a..da3a64de540e8 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -193,13 +193,15 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content index b31bec10619ec..45da2f61b4da6 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_cluster-completed.spec_content @@ -214,6 +214,7 @@ spec: amazonvpc: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: true enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -222,8 +223,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 82d603ced8d72..29d510207398f 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -112,7 +112,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content index 52ed09ace20ed..dacff83248936 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_cluster-completed.spec_content @@ -223,6 +223,7 @@ spec: memoryRequest: 100Mi nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -231,8 +232,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 172.20.0.0/16 podCIDR: 172.20.128.0/17 secretStore: memfs://tests/many-addons.example.com/secrets diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content index 1aaa19f4cfb49..3339cb78c5012 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-bootstrap_content @@ -112,7 +112,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 31545eb9bf6086d7f5dd39503fcbf3b01a5f337b18b95f4ed9094a06312cbce8 + manifestHash: 9b029a1d1cf9052871d0f5c53d2876054ca11c8151e3ec62ed6623519b044bf4 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-node-termination-handler.aws-k8s-1.11_content index bb7498f2cd0bd..e0c2c0634fbe8 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_object_many-addons.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/many-addons-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content index 161ed14a4bba3..cf4da4357680e 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_cluster-completed.spec_content @@ -198,6 +198,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -206,8 +207,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index b821c04e2e6a7..49a3bea7520e7 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-1.25/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content index 47921ac3f9617..e5ed80268eac8 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_cluster-completed.spec_content @@ -198,6 +198,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -206,8 +207,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 8652ec913634c..adfdc2d5774b2 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-1.26/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content index 094c16d7d551c..9411595a9c951 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index b2601b9797988..8f6715e15f6ea 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-1.27/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content index 5cb4f412b335c..1c85385ecd37e 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index aff67fa2a242d..f9c278c8a2230 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-1.28/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content index e50012b92556c..e3aaa35e2122c 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 8d38c32546ff7..3337adfd42bfc 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-1.29/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content index c399d647d54f4..0a18032d43b86 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index c434b0b06f86e..d9285b618aff5 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-1.30/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content index 2cceea4937677..436a4060b72e2 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_cluster-completed.spec_content @@ -181,6 +181,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -189,8 +190,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal-aws.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content index 0fe72e83535de..4ddb4c68cc948 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 1e66f34d3315646be987b84940bf5d42dc394d01a08e6aef618613307d18efe3 + manifestHash: b19b7584337c7aaf2543011135671d520e6b765218db5c16de488831514a994d name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 48f7125f7cfee..63deaf25a8e6b 100644 --- a/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-aws/data/aws_s3_object_minimal-aws.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-aws-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content index 42bc71a1d824b..9c159bbb56a43 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_cluster-completed.spec_content @@ -197,6 +197,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -205,8 +206,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://tests/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 87a2fb5072f79..9db2d11ef9bdb 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -34,7 +34,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-dns-none/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content index 944639ef3e23d..fb0edc428597c 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_cluster-completed.spec_content @@ -198,6 +198,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -206,8 +207,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal-etcd.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content index 9fa3395fb8879..1f7fa37df7c37 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: e24ab33742d589a0af522ac0f8242a089a599e8437d8de24ecdfa96b8aef00f5 + manifestHash: 572969ce3317645bab2903d85a0efd3c60b31cde83bb54b1fcaca48f8e581b21 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 8a5d0fea412d3..178468457a225 100644 --- a/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-etcd/data/aws_s3_object_minimal-etcd.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-etcd-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content index d50e170b5d0ae..0b8f073a5bf06 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_cluster-completed.spec_content @@ -196,6 +196,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -204,8 +205,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 024bc52ae5efc..a79b17981b596 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content index ee4a3fc5bea32..ed053a5c94114 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_cluster-completed.spec_content @@ -199,6 +199,7 @@ spec: encapsulationMode: none nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -207,8 +208,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: ::/0 secretStore: memfs://clusters.example.com/minimal-ipv6.example.com/secrets serviceClusterIPRange: fd00:5e4f:ce::/108 diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 11eb09d811b45..d0114ab9af2e4 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 18e805b619c93f895bdba18ba616506dc44ce7cd0af99feb1987edbf05b6f7e1 + manifestHash: 70fef25dcbf9ab956bb6f68a4041beafba76eea75071066fcb34459bc1c7035e name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 8d65e62782d22..2b06150d67823 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-ipv6-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content index a2181f31ecd7f..f22e2d873c69b 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_cluster-completed.spec_content @@ -229,6 +229,7 @@ spec: version: v1.15.4 nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -237,8 +238,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: ::/0 secretStore: memfs://clusters.example.com/minimal-ipv6.example.com/secrets serviceClusterIPRange: fd00:5e4f:ce::/108 diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index a1d252450f29a..cc6da7320177c 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 18e805b619c93f895bdba18ba616506dc44ce7cd0af99feb1987edbf05b6f7e1 + manifestHash: 70fef25dcbf9ab956bb6f68a4041beafba76eea75071066fcb34459bc1c7035e name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 8d65e62782d22..2b06150d67823 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-ipv6-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content index f96df053d6ddc..f86c3d51a7145 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_cluster-completed.spec_content @@ -198,6 +198,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -206,8 +207,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: ::/0 secretStore: memfs://clusters.example.com/minimal-ipv6.example.com/secrets serviceClusterIPRange: fd00:5e4f:ce::/108 diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 127c7b9e82adf..ca8bb51e7f48a 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 18e805b619c93f895bdba18ba616506dc44ce7cd0af99feb1987edbf05b6f7e1 + manifestHash: 70fef25dcbf9ab956bb6f68a4041beafba76eea75071066fcb34459bc1c7035e name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 8d65e62782d22..2b06150d67823 100644 --- a/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-ipv6-no-subnet-prefix/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-ipv6-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content index 3620ad485f009..11250f44a85e0 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -198,6 +198,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -206,8 +207,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: ::/0 secretStore: memfs://clusters.example.com/minimal-ipv6.example.com/secrets serviceClusterIPRange: fd00:5e4f:ce::/108 diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 127c7b9e82adf..ca8bb51e7f48a 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 18e805b619c93f895bdba18ba616506dc44ce7cd0af99feb1987edbf05b6f7e1 + manifestHash: 70fef25dcbf9ab956bb6f68a4041beafba76eea75071066fcb34459bc1c7035e name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 8d65e62782d22..2b06150d67823 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-ipv6-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content index e16e577ece533..13bb41e3cf2e0 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_cluster-completed.spec_content @@ -186,6 +186,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -194,8 +195,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/this.is.truly.a.really.really.long.cluster-name.minimal.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content index 2d949c047fcc5..f68be668bd764 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 9fb55f042db7bbada14430021c2d49bbad5b92d8fe3ff63b2545dbab5019fc06 + manifestHash: 6b7f3bb6da6160ab4d97ffc26bc5cec30602788e8b3883bea59e02d0b1eb3bd4 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 196f03b77a672..b3a4c4713635e 100644 --- a/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-longclustername/data/aws_s3_object_this.is.truly.a.really.really.long.cluster-name.minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/this-is-truly-a-really-really-long-cluster-name-minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content index 5a5e2d76044e8..2534c82795941 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_cluster-completed.spec_content @@ -221,6 +221,7 @@ spec: version: v1.15.4 nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -229,8 +230,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal-warmpool.example.com/secrets diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content index c039f6ae2dee6..64e6db1aa40a4 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: ea21e39fa4a487c3a892cf127a6aecd86fa48a44f832da318a2ea123050c59aa + manifestHash: 7f8d3b5a7136ef69863c7fe3d460fbfe0c49f1d2d22d9a1452f7d668c931f8a6 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-node-termination-handler.aws-k8s-1.11_content index c6be29ba5e32a..225f6761b29c9 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_object_minimal-warmpool.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-warmpool-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content index ae34a4c5175cb..53f6788690a8f 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_cluster-completed.spec_content @@ -189,6 +189,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -197,8 +198,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.k8s.local/secrets diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content index 9aacf6b2cf87f..0e58b96890d3a 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: cb3d49e6ced4f62cd1c641fde7bd2dd53654eca2d34c40f185091c287e110722 + manifestHash: 6dc0b552884ce2d6f77de356c7db6b6ee13b66ed8cd1d982db073049daf041bd name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-node-termination-handler.aws-k8s-1.11_content index ec7931034784a..a74912d52c322 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_object_minimal.k8s.local-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-k8s-local-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content index 73dc56c6b9ca7..e3d7b799c7dce 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_cluster-completed.spec_content @@ -190,6 +190,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -198,8 +199,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.k8s.local/secrets diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content index 566d343fc1069..0eae163958e78 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 823c9be1de94825c5ff27fa8864c2137ebf2afb52cb0335f0d810dee4d9d72fc + manifestHash: dd0109990a2a74e3c5dfc39168886f87d0b16c616cbff0bdbbe572d0c4e0272b name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-node-termination-handler.aws-k8s-1.11_content index f42841e8bc5da..d620d4b91d991 100644 --- a/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/minimal_gossip_irsa/data/aws_s3_object_minimal.k8s.local-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -193,13 +193,15 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-k8s-local-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.k8s.local - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content index f4f729939aa0a..00079d4b88776 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_cluster-completed.spec_content @@ -198,6 +198,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -206,8 +207,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/mixedinstances.example.com/secrets diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content index 00141d7673f28..c2d90560a574c 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: a40371bfa6750089fcd80b0c579c8af3b50e7e1e2b769902fd7f12d4a88d2b5a + manifestHash: 52b641187d16e546bde019c042227395d0ad507ffb95aac46624f681d8c5f158 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ee78850b0c9d7..7ccfda1abc47e 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_object_mixedinstances.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/mixedinstances-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content index f4f729939aa0a..00079d4b88776 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_cluster-completed.spec_content @@ -198,6 +198,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -206,8 +207,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/mixedinstances.example.com/secrets diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content index 00141d7673f28..c2d90560a574c 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: a40371bfa6750089fcd80b0c579c8af3b50e7e1e2b769902fd7f12d4a88d2b5a + manifestHash: 52b641187d16e546bde019c042227395d0ad507ffb95aac46624f681d8c5f158 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ee78850b0c9d7..7ccfda1abc47e 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_object_mixedinstances.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/mixedinstances-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content index 4eaa0f018a374..bcefd9470ca63 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_cluster-completed.spec_content @@ -191,6 +191,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableSQSTerminationDraining: false @@ -200,8 +201,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/secrets diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content index 51440db4d5a8b..f418f35ced088 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 6e3384fa64e8d2e1180f3dfa8eff20b059d42fab79bd4aadf6f449ac573550e8 + manifestHash: fa4659f06670b8277b2d14333d685b1029c08c5071df9ceae4112495dff9f14f name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content index dcd262b36b3fe..8b7be34503f41 100644 --- a/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/nth-imds-processor-irsa/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -206,7 +206,7 @@ spec: value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.nthimdsproces-vt9566 - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent name: aws-node-termination-handler resources: diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content index 18a94528b48f7..c2c3a240e6d80 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_cluster-completed.spec_content @@ -190,6 +190,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableSQSTerminationDraining: false @@ -199,8 +200,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/nthimdsprocessor.longclustername.example.com/secrets diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content index 1385c1e47e323..3af97a7be5fbd 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 8255a20f3b6faaad25ff1c6936dcf6da74d6638925db6c0b4e24e7b6f8091588 + manifestHash: 3749ac89e89cc0b9921ece32cd99e003cd2db321f0b7a34ba49c8b89488d18ea name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 5f742d339e157..fc8d7543ce570 100644 --- a/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/nth-imds-processor/data/aws_s3_object_nthimdsprocessor.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -202,7 +202,7 @@ spec: value: "false" - name: UPTIME_FROM_FILE value: /proc/uptime - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent name: aws-node-termination-handler resources: diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content index 22c2c5475b881..444160e9f81bb 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 39ac947ed2db4..caccf0a6880f1 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content index 3dcaa271d9c86..6b235f2c856e7 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/private-shared-ip.example.com/secrets diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content index 9444d0c73423b..1ca83c961e948 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 74cd88a5135916fedbd2bbb50799bd2c75fa1cfb20da412c74872447d5dabb5b + manifestHash: 9c69d1124c4dd40be7f22680596440ce616e2ad659ff4cac3d171958c3be0fea name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-node-termination-handler.aws-k8s-1.11_content index b3a43d5389049..ad725f5da4ee1 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_object_private-shared-ip.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/private-shared-ip-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content index d70583b25ac98..4897dbdbcbfa0 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/private-shared-subnet.example.com/secrets diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content index 0851d8785a8a7..609f6220b95f4 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 551704e395b9e9cd4334a013f8c20bb583bf3fafa4e9f1548defa0995bb89593 + manifestHash: 654d443548004d79069c571d47f56604b3912f0ee3e36c40f6bd635e9c92174e name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-node-termination-handler.aws-k8s-1.11_content index cb2e16ef9a063..91c25fe108b06 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_object_private-shared-subnet.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/private-shared-subnet-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content index 07bab273a784a..bcb2b8b756bfe 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_cluster-completed.spec_content @@ -195,6 +195,7 @@ spec: encapsulationMode: ipip nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -203,8 +204,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/privatecalico.example.com/secrets diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content index b26d8798ba2b9..c2abdaabae110 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 76f843bddec2fe707f08e71cd3e0f94c121dee06ba88d448efa6c3939384283a + manifestHash: 2f1845d6a7c8f2a729f958ffa42c457e1be12c0bdb4dbbd35a52de9b9c49f019 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 0e9b0bc9a7c7b..59b5312e5bf33 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_object_privatecalico.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/privatecalico-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content index 94f51b7ba0cb1..8c74eab29314f 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_cluster-completed.spec_content @@ -192,6 +192,7 @@ spec: canal: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -200,8 +201,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/privatecanal.example.com/secrets diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content index f997a80664a11..9962d9f9406c9 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 52a3df495560178eaaed6ec1bd63e7af0e6977d354206cb1e8e43212f41a7100 + manifestHash: f22a4f2c1d350d49b295c98e4275a977685ea0ed0cc4efd271d82f2fecdb7b9c name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index d2171e172fbe5..2f9fdc655796c 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_object_privatecanal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/privatecanal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content index c3a4f6524e00e..86c5cc242832b 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_cluster-completed.spec_content @@ -223,6 +223,7 @@ spec: version: v1.15.4 nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -231,8 +232,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/privatecilium.example.com/secrets diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index f1bb8e83daa64..fa4d5ca7315fd 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: b6ec22cfd4fee4c561c13a0a7935880b0b2a1798bc0218e659c207661dd65f18 + manifestHash: 44a69bc40b96f5e5116ef47600852cb1bd9084777d45e222d39d29dc3c77e5a0 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ae60b5606f3f0..9d8dc1c1230e6 100644 --- a/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/privatecilium-eni/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/privatecilium-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content index adfcada3f8845..b8ada2ef26a22 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_cluster-completed.spec_content @@ -231,6 +231,7 @@ spec: version: v1.15.4 nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -239,8 +240,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/privatecilium.example.com/secrets diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index 10b47c8211c0a..bd0376a0455e0 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: b6ec22cfd4fee4c561c13a0a7935880b0b2a1798bc0218e659c207661dd65f18 + manifestHash: 44a69bc40b96f5e5116ef47600852cb1bd9084777d45e222d39d29dc3c77e5a0 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ae60b5606f3f0..9d8dc1c1230e6 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/privatecilium-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content index 7ac7b84006fef..7f50ca6a4d15d 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_cluster-completed.spec_content @@ -226,6 +226,7 @@ spec: version: v1.15.4 nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -234,8 +235,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/privatecilium.example.com/secrets diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content index 8f5f4f1ad8ac3..861d2a5dfd18d 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-bootstrap_content @@ -97,7 +97,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: b6ec22cfd4fee4c561c13a0a7935880b0b2a1798bc0218e659c207661dd65f18 + manifestHash: 44a69bc40b96f5e5116ef47600852cb1bd9084777d45e222d39d29dc3c77e5a0 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ae60b5606f3f0..9d8dc1c1230e6 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_object_privatecilium.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/privatecilium-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content index e1a1546678300..df814d6e9e894 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_cluster-completed.spec_content @@ -235,6 +235,7 @@ spec: version: v1.15.4 nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -243,8 +244,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/privateciliumadvanced.example.com/secrets diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content index fd40ba69ae0de..8ebfa30391b7d 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: a821fe0a1a7bdf3854cb227a7731b692277f9483be4708625424e1606dd089e1 + manifestHash: 097af86d7086c3bddb6104aa47da822207cdc8b779cb82e0dcdb7fc4eda4b7ce name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 34443a1a11b3b..167b5075c6db4 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_object_privateciliumadvanced.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/privateciliumadvanced-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content index 833669047bf71..5d74f358028c6 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_cluster-completed.spec_content @@ -190,6 +190,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -198,8 +199,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/privatedns1.example.com/secrets diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content index 46e7c74fee3b7..07696252e1f60 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 4a6b8c56b29e0a423f9284ca055c469ad3c763c8f42cd5b10a91b01c237e33ab + manifestHash: 8a4cc1747e6a73a1d939543008fb96fac500dc9e7a861d30b1ecb03e01670d5f name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-node-termination-handler.aws-k8s-1.11_content index c9945e1ddace1..c272290a60305 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_object_privatedns1.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/privatedns1-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content index 2585b736ada60..9629cc2446d22 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/privatedns2.example.com/secrets diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content index e593897cfd02d..05f77839396bb 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 63512b497cfbfe50659de24c678ba743d2378976c6ff692b677321ec72c6deff + manifestHash: 4f2c46c7522009364b96412a1eb05e8fb29c71697a770783010874914512d8f3 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-node-termination-handler.aws-k8s-1.11_content index e80533e260481..ad294d92c45d8 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_object_privatedns2.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/privatedns2-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content index b1e121b0ccdf1..3b37b6c4c5a78 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: backend: vxlan nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/privateflannel.example.com/secrets diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content index 82ae7006afee2..7bc715cf1bea1 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 7d98290e7768c3c32894ef17d6a5d8e4a68c88bae3c67e36a91b90cbe8072981 + manifestHash: e5a3bd05e45d66c657b821de28cb09a3342e330d7f9ae2d83d1f0030f841879b name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 94b40b2350575..3777b11196bd3 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_object_privateflannel.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/privateflannel-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content index 908b46b3328fd..6df5a7ed8845b 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_cluster-completed.spec_content @@ -192,6 +192,7 @@ spec: kopeio: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -200,8 +201,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/privatekopeio.example.com/secrets diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content index 770505f557d88..b08ad92e4183a 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 938bf9a20d0c8f0671df0e135aacc8e0b29ef2bb53d161a8204432ffea70121d + manifestHash: b224f6eebf4bd04fc11eee747d37255cb29b682dc49c9345744b6667a6ef36d7 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 01fc71261f76f..6fd42b71a9b93 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_object_privatekopeio.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/privatekopeio-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content index 13a81ad043344..b18d1f6f08f2b 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_cluster-completed.spec_content @@ -187,6 +187,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -195,8 +196,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index d10da53322a5f..7ed5172cb4737 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: d866a5436fc9a285cbaefb8ffc8d5582a3239e563dda381f23f62482851fd489 + manifestHash: 09840259d2fc87e0f9704d14df71a803b21e5f9a65017929f4721eb191b53f70 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index ac291e5e9b40a..da3a64de540e8 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -193,13 +193,15 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - name: AWS_ROLE_ARN value: arn:aws-test:iam::123456789012:role/aws-node-termination-handler.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content index 62bf4fcfd73e6..57c33f2fd4b63 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_cluster-completed.spec_content @@ -191,6 +191,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -199,8 +200,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/sharedsubnet.example.com/secrets diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content index f7e22cee615a6..06a88c44b4782 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: d39cefc418ead9c04871952a81e826608adf94f4633f92a8dc2986d871894c7c + manifestHash: a81607c75159fd7720e8bc553120d8e15b86e5b74232dd9094480a21299a72c7 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 5fd5b4d86ce7e..b824e6f8ba49f 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_object_sharedsubnet.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/sharedsubnet-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content index 952cd3e0a3ccb..73ca30cdea832 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_cluster-completed.spec_content @@ -191,6 +191,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -199,8 +200,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/sharedvpc.example.com/secrets diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content index 5019d93908962..5b0c9350708f5 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: afa362fdcc354a71fab37581cb0b640d476677dd857e4218e648039f7a743ddd + manifestHash: 954ebf0e675c9ccd4271334d3195a2b088e4cf4a94c69b4595c5cbf7a63f540a name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-node-termination-handler.aws-k8s-1.11_content index b8f7344d1d542..19bb0ed51bc1b 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_object_sharedvpc.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/sharedvpc-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content index b352d3841b489..6283ffa29a508 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_cluster-completed.spec_content @@ -199,6 +199,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -207,8 +208,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: ::/0 secretStore: memfs://clusters.example.com/minimal-ipv6.example.com/secrets serviceClusterIPRange: fd00:5e4f:ce::/108 diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content index 127c7b9e82adf..ca8bb51e7f48a 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -48,7 +48,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 18e805b619c93f895bdba18ba616506dc44ce7cd0af99feb1987edbf05b6f7e1 + manifestHash: 70fef25dcbf9ab956bb6f68a4041beafba76eea75071066fcb34459bc1c7035e name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 8d65e62782d22..2b06150d67823 100644 --- a/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/shared_vpc_ipv6/data/aws_s3_object_minimal-ipv6.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-ipv6-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content index 9a7f7f7eec4f5..41a5b27ec4de3 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_cluster-completed.spec_content @@ -193,6 +193,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -201,8 +202,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/unmanaged.example.com/secrets diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content index 30ce42d7d9a1e..0bdef6d75ac7d 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: b4bade550ae20cd5c4a275bfb6417ecb712913519d918ac95026a38c01d9640e + manifestHash: 5968db46122e79f9a6600492e874cf0dad9a8018689dca037ace9afd723adb90 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 2f063bc5dbba4..1357442b9b653 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_object_unmanaged.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/unmanaged-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content index 2ed66b190c87c..5634b378fbd6c 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_cluster-completed.spec_content @@ -190,6 +190,7 @@ spec: cni: {} nodeTerminationHandler: cpuRequest: 50m + deleteSQSMsgIfNodeNotFound: false enableRebalanceDraining: false enableRebalanceMonitoring: false enableScheduledEventDraining: true @@ -198,8 +199,10 @@ spec: excludeFromLoadBalancers: true managedASGTag: aws-node-termination-handler/managed memoryRequest: 64Mi + podTerminationGracePeriod: -1 prometheusEnable: false - version: v1.18.3 + taintNode: false + version: v1.22.0 nonMasqueradeCIDR: 100.64.0.0/10 podCIDR: 100.96.0.0/11 secretStore: memfs://clusters.example.com/minimal.example.com/secrets diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 024bc52ae5efc..a79b17981b596 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: bd6955162f93335d20e8f1215411cb1e8388371f2f4a1ff6e29529175db262f9 + manifestHash: 1d0968eea99ca0d78400867a76af8b1dfe93ef2ff9640f0d755b21b2db7fec41 name: node-termination-handler.aws prune: kinds: diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content index 1428d2b994c4e..f1361e7994f2b 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -26,7 +26,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler rules: @@ -84,7 +84,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws name: aws-node-termination-handler roleRef: @@ -109,7 +109,7 @@ metadata: app.kubernetes.io/managed-by: kops app.kubernetes.io/name: aws-node-termination-handler app.kubernetes.io/part-of: aws-node-termination-handler - app.kubernetes.io/version: v1.18.3 + app.kubernetes.io/version: v1.22.0 k8s-addon: node-termination-handler.aws k8s-app: aws-node-termination-handler name: aws-node-termination-handler @@ -203,9 +203,11 @@ spec: value: "true" - name: QUEUE_URL value: https://sqs.us-test-1.amazonaws.com/123456789012/minimal-example-com-nth + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "false" - name: WORKERS value: "10" - image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.18.3 + image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.22.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template b/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template index a0977bf43aac1..af8bc3368e487 100644 --- a/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template +++ b/upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template @@ -1,6 +1,6 @@ {{ with .CloudProvider.AWS.NodeTerminationHandler }} -# Sourced from https://github.com/aws/aws-node-termination-handler/releases/download/v1.18.3/all-resources.yaml -# and https://github.com/aws/aws-node-termination-handler/releases/download/v1.18.3/all-resources-queue-processor.yaml +# Sourced from https://github.com/aws/aws-node-termination-handler/releases/download/v1.22.0/all-resources.yaml +# and https://github.com/aws/aws-node-termination-handler/releases/download/v1.22.0/all-resources-queue-processor.yaml --- # Source: aws-node-termination-handler/templates/serviceaccount.yaml apiVersion: v1 @@ -191,7 +191,7 @@ spec: - name: CORDON_ONLY value: "false" - name: TAINT_NODE - value: "false" + value: "{{ WithDefaultBool .TaintNode false }}" - name: EXCLUDE_FROM_LOAD_BALANCERS value: "{{ .ExcludeFromLoadBalancers }}" - name: DELETE_LOCAL_DATA @@ -199,7 +199,7 @@ spec: - name: IGNORE_DAEMON_SETS value: "true" - name: POD_TERMINATION_GRACE_PERIOD - value: "-1" + value: "{{ .PodTerminationGracePeriod }}" - name: NODE_TERMINATION_GRACE_PERIOD value: "120" - name: EMIT_KUBERNETES_EVENTS @@ -210,8 +210,14 @@ spec: value: "true" - name: QUEUE_URL value: "{{ DefaultQueueName }}" + - name: DELETE_SQS_MSG_IF_NODE_NOT_FOUND + value: "{{ WithDefaultBool .DeleteSQSMsgIfNodeNotFound false }}" - name: WORKERS value: "10" + {{ if .WebhookTemplate }} + - name: WEBHOOK_TEMPLATE + value: '{{ .WebhookTemplate }}' + {{ end }} {{ if .WebhookURL }} - name: WEBHOOK_URL value: {{ .WebhookURL }} @@ -230,6 +236,10 @@ spec: initialDelaySeconds: 5 periodSeconds: 5 resources: + {{ if .MemoryLimit }} + limits: + memory: {{ .MemoryLimit }} + {{ end }} requests: cpu: {{ .CPURequest }} memory: {{ .MemoryRequest }} @@ -356,7 +366,7 @@ spec: - name: CORDON_ONLY value: "false" - name: TAINT_NODE - value: "false" + value: "{{ WithDefaultBool .TaintNode false }}" - name: EXCLUDE_FROM_LOAD_BALANCERS value: "{{ WithDefaultBool .ExcludeFromLoadBalancers true }}" - name: DELETE_LOCAL_DATA @@ -364,7 +374,7 @@ spec: - name: IGNORE_DAEMON_SETS value: "true" - name: POD_TERMINATION_GRACE_PERIOD - value: "-1" + value: "{{ .PodTerminationGracePeriod }}" - name: NODE_TERMINATION_GRACE_PERIOD value: "120" - name: EMIT_KUBERNETES_EVENTS @@ -381,7 +391,19 @@ spec: value: "false" - name: UPTIME_FROM_FILE value: "/proc/uptime" + {{ if .WebhookTemplate }} + - name: WEBHOOK_TEMPLATE + value: '{{ .WebhookTemplate }}' + {{ end }} + {{ if .WebhookURL }} + - name: WEBHOOK_URL + value: {{ .WebhookURL }} + {{ end }} resources: + {{ if .MemoryLimit }} + limits: + memory: {{ .MemoryLimit }} + {{ end }} requests: cpu: {{ .CPURequest }} memory: {{ .MemoryRequest }} diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml index 01dd1816411f2..23e34fdf3b94d 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 51e69ff5fbd9d98295cdcc692bf031267c248d2b4ecc79abe9c1aefe3435a18d + manifestHash: 270ca70bc2db351ce44d745806f96186f393ed7df6d7cd8a947942b2e57b87cf name: node-termination-handler.aws prune: kinds: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index 01dd1816411f2..23e34fdf3b94d 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 51e69ff5fbd9d98295cdcc692bf031267c248d2b4ecc79abe9c1aefe3435a18d + manifestHash: 270ca70bc2db351ce44d745806f96186f393ed7df6d7cd8a947942b2e57b87cf name: node-termination-handler.aws prune: kinds: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index be19cd2951457..d96c6c99fe632 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 51e69ff5fbd9d98295cdcc692bf031267c248d2b4ecc79abe9c1aefe3435a18d + manifestHash: 270ca70bc2db351ce44d745806f96186f393ed7df6d7cd8a947942b2e57b87cf name: node-termination-handler.aws prune: kinds: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml index ce552b072d856..ad6f0bdd56206 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 51e69ff5fbd9d98295cdcc692bf031267c248d2b4ecc79abe9c1aefe3435a18d + manifestHash: 270ca70bc2db351ce44d745806f96186f393ed7df6d7cd8a947942b2e57b87cf name: node-termination-handler.aws prune: kinds: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml index aee70114099e4..ffa0804a80b50 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 51e69ff5fbd9d98295cdcc692bf031267c248d2b4ecc79abe9c1aefe3435a18d + manifestHash: 270ca70bc2db351ce44d745806f96186f393ed7df6d7cd8a947942b2e57b87cf name: node-termination-handler.aws prune: kinds: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml index 2d62337ea67f1..5ce855559138a 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 51e69ff5fbd9d98295cdcc692bf031267c248d2b4ecc79abe9c1aefe3435a18d + manifestHash: 270ca70bc2db351ce44d745806f96186f393ed7df6d7cd8a947942b2e57b87cf name: node-termination-handler.aws prune: kinds: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml index cf695958de8cc..68c854b4ab2ee 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 51e69ff5fbd9d98295cdcc692bf031267c248d2b4ecc79abe9c1aefe3435a18d + manifestHash: 270ca70bc2db351ce44d745806f96186f393ed7df6d7cd8a947942b2e57b87cf name: node-termination-handler.aws prune: kinds: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml index 1cf9662093f59..a520c28929313 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/insecure-1.19/manifest.yaml @@ -55,7 +55,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 51e69ff5fbd9d98295cdcc692bf031267c248d2b4ecc79abe9c1aefe3435a18d + manifestHash: 270ca70bc2db351ce44d745806f96186f393ed7df6d7cd8a947942b2e57b87cf name: node-termination-handler.aws prune: kinds: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml index 194c79fb8244c..fb8ed0a888e60 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/metrics-server/secure-1.19/manifest.yaml @@ -112,7 +112,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 51e69ff5fbd9d98295cdcc692bf031267c248d2b4ecc79abe9c1aefe3435a18d + manifestHash: 270ca70bc2db351ce44d745806f96186f393ed7df6d7cd8a947942b2e57b87cf name: node-termination-handler.aws prune: kinds: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml index d0c7db9c8805e..96019ef577cdf 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: c16f4c395b90a9e46e258af6c4f26920548f4acbfe68f93343f018753c8c4f81 + manifestHash: 2ee32b8f718b419142de3d7e9cbe1f6ef5e0cebb6f84aad958975954653d974a name: node-termination-handler.aws prune: kinds: diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 73c5b5baf614a..e99484394264e 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.11 manifest: node-termination-handler.aws/k8s-1.11.yaml - manifestHash: 51e69ff5fbd9d98295cdcc692bf031267c248d2b4ecc79abe9c1aefe3435a18d + manifestHash: 270ca70bc2db351ce44d745806f96186f393ed7df6d7cd8a947942b2e57b87cf name: node-termination-handler.aws prune: kinds: