Merge pull request #18140 from rifelpet/nth-out-of-service

aws: Add EnableOutOfServiceTaint field to NodeTerminationHandler

Author: k8s-ci-robot

k8s/crds/kops.k8s.io_clusters.yaml

@@ -6218,6 +6218,12 @@ spec:
                       Only used in Queue Processor mode.
                       Default: false
                     type: boolean
+                  enableOutOfServiceTaint:
+                    description: |-
+                      EnableOutOfServiceTaint makes node termination handler apply the node.kubernetes.io/out-of-service taint
+                      to nodes during non-graceful shutdown, allowing Kubernetes to quickly detach volumes and reschedule pods.
+                      Default: false
+                    type: boolean
                   enableRebalanceDraining:
                     description: |-
                       EnableRebalanceDraining makes node termination handler drain nodes when the rebalance recommendation notice is received.

pkg/apis/kops/componentconfig.go

@@ -1039,6 +1039,11 @@ type NodeTerminationHandlerSpec struct {
 	// Default: false
 	EnableRebalanceDraining *bool `json:"enableRebalanceDraining,omitempty"`
 
+	// EnableOutOfServiceTaint makes node termination handler apply the node.kubernetes.io/out-of-service taint
+	// to nodes during non-graceful shutdown, allowing Kubernetes to quickly detach volumes and reschedule pods.
+	// Default: false
+	EnableOutOfServiceTaint *bool `json:"enableOutOfServiceTaint,omitempty"`
+
 	// EnablePrometheusMetrics enables the "/metrics" endpoint.
 	// Default: false
 	EnablePrometheusMetrics *bool `json:"prometheusEnable,omitempty"`

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -1109,6 +1109,11 @@ type NodeTerminationHandlerSpec struct {
 	// Default: false
 	EnableRebalanceDraining *bool `json:"enableRebalanceDraining,omitempty"`
 
+	// EnableOutOfServiceTaint makes node termination handler apply the node.kubernetes.io/out-of-service taint
+	// to nodes during non-graceful shutdown, allowing Kubernetes to quickly detach volumes and reschedule pods.
+	// Default: false
+	EnableOutOfServiceTaint *bool `json:"enableOutOfServiceTaint,omitempty"`
+
 	// EnablePrometheusMetrics enables the "/metrics" endpoint.
 	// Default: false
 	EnablePrometheusMetrics *bool `json:"prometheusEnable,omitempty"`

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

@@ -1035,6 +1035,11 @@ type NodeTerminationHandlerSpec struct {
 	// Default: false
 	EnableRebalanceDraining *bool `json:"enableRebalanceDraining,omitempty"`
 
+	// EnableOutOfServiceTaint makes node termination handler apply the node.kubernetes.io/out-of-service taint
+	// to nodes during non-graceful shutdown, allowing Kubernetes to quickly detach volumes and reschedule pods.
+	// Default: false
+	EnableOutOfServiceTaint *bool `json:"enableOutOfServiceTaint,omitempty"`
+
 	// EnablePrometheusMetrics enables the "/metrics" endpoint.
 	// Default: false
 	EnablePrometheusMetrics *bool `json:"prometheusEnable,omitempty"`

pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

@@ -66,6 +66,10 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o *kops.Cluster) err
 		nth.EnableRebalanceDraining = fi.PtrTo(false)
 	}
 
+	if nth.EnableOutOfServiceTaint == nil {
+		nth.EnableOutOfServiceTaint = fi.PtrTo(false)
+	}
+
 	if nth.EnablePrometheusMetrics == nil {
 		nth.EnablePrometheusMetrics = fi.PtrTo(false)
 	}
@@ -97,7 +101,7 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o *kops.Cluster) err
 	}
 
 	if nth.Version == nil {
-		nth.Version = fi.PtrTo("v1.22.0")
+		nth.Version = fi.PtrTo("v1.25.5")
 	}
 
 	return nil