Enable NTH Scheduled Event Draining by default

docs/releases/1.26-NOTES.md

@@ -29,7 +29,7 @@ with "control-plane-". The names of groups for existing clusters are unchanged.
 
 * New clusters can more easily be configured to use Cilium in ENI mode by setting `--networking=cilium-eni`.
 
-* Node Termination Handler now defaults to Queue-Processor mode.
+* Node Termination Handler now defaults to Queue-Processor mode. It also now enables Scheduled Event Draining by default.
 
 ## GCP
 

k8s/crds/kops.k8s.io_clusters.yaml

@@ -5351,7 +5351,7 @@ spec:
                   enableScheduledEventDraining:
                     description: 'EnableScheduledEventDraining makes node termination
                       handler drain nodes before the maintenance window starts for
-                      an EC2 instance scheduled event. Default: false'
+                      an EC2 instance scheduled event. Default: true'
                     type: boolean
                   enableSpotInterruptionDraining:
                     description: 'EnableSpotInterruptionDraining makes node termination

pkg/apis/kops/componentconfig.go

@@ -927,7 +927,7 @@ type NodeTerminationHandlerConfig struct {
 	// Default: true
 	EnableSpotInterruptionDraining *bool `json:"enableSpotInterruptionDraining,omitempty"`
 	// EnableScheduledEventDraining makes node termination handler drain nodes before the maintenance window starts for an EC2 instance scheduled event.
-	// Default: false
+	// Default: true
 	EnableScheduledEventDraining *bool `json:"enableScheduledEventDraining,omitempty"`
 	// EnableRebalanceMonitoring makes node termination handler cordon nodes when the rebalance recommendation notice is received
 	// Default: false

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -953,7 +953,7 @@ type NodeTerminationHandlerConfig struct {
 	// Default: true
 	EnableSpotInterruptionDraining *bool `json:"enableSpotInterruptionDraining,omitempty"`
 	// EnableScheduledEventDraining makes node termination handler drain nodes before the maintenance window starts for an EC2 instance scheduled event.
-	// Default: false
+	// Default: true
 	EnableScheduledEventDraining *bool `json:"enableScheduledEventDraining,omitempty"`
 	// EnableRebalanceMonitoring makes node termination handler cordon nodes when the rebalance recommendation notice is received
 	// Default: false

pkg/apis/kops/v1alpha3/componentconfig.go

@@ -924,7 +924,7 @@ type NodeTerminationHandlerConfig struct {
 	// Default: true
 	EnableSpotInterruptionDraining *bool `json:"enableSpotInterruptionDraining,omitempty"`
 	// EnableScheduledEventDraining makes node termination handler drain nodes before the maintenance window starts for an EC2 instance scheduled event.
-	// Default: false
+	// Default: true
 	EnableScheduledEventDraining *bool `json:"enableScheduledEventDraining,omitempty"`
 	// EnableRebalanceMonitoring makes node termination handler cordon nodes when the rebalance recommendation notice is received
 	// Default: false

pkg/model/components/nodeterminationhandler.go

@@ -43,7 +43,7 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o interface{}) error
 		nth.EnableSpotInterruptionDraining = fi.PtrTo(true)
 	}
 	if nth.EnableScheduledEventDraining == nil {
-		nth.EnableScheduledEventDraining = fi.PtrTo(false)
+		nth.EnableScheduledEventDraining = fi.PtrTo(true)
 	}
 	if nth.EnableRebalanceMonitoring == nil {
 		nth.EnableRebalanceMonitoring = fi.PtrTo(false)

upup/models/cloudup/resources/addons/node-termination-handler.aws/k8s-1.11.yaml.template

@@ -209,7 +209,7 @@ spec:
             - name: ENABLE_SPOT_INTERRUPTION_DRAINING
               value: "{{ WithDefaultBool .EnableSpotInterruptionDraining true }}"
             - name: ENABLE_SCHEDULED_EVENT_DRAINING
-              value: "{{ WithDefaultBool .EnableScheduledEventDraining false }}"
+              value: "{{ WithDefaultBool .EnableScheduledEventDraining true }}"
             - name: ENABLE_REBALANCE_MONITORING
               value: "{{ WithDefaultBool .EnableRebalanceMonitoring false }}"
             - name: ENABLE_REBALANCE_DRAINING
@@ -376,7 +376,7 @@ spec:
             - name: ENABLE_SPOT_INTERRUPTION_DRAINING
               value: "{{ WithDefaultBool .EnableSpotInterruptionDraining true }}"
             - name: ENABLE_SCHEDULED_EVENT_DRAINING
-              value: "{{ WithDefaultBool .EnableScheduledEventDraining false }}"
+              value: "{{ WithDefaultBool .EnableScheduledEventDraining true }}"
             - name: ENABLE_REBALANCE_MONITORING
               value: "{{ WithDefaultBool .EnableRebalanceMonitoring false }}"
             - name: ENABLE_REBALANCE_DRAINING