Bump NTH 1.16 and add excludeFromLoadBalancers option

k8s/crds/kops.k8s.io_clusters.yaml

@@ -5241,6 +5241,11 @@ spec:
                     description: 'Enabled enables the node termination handler. Default:
                       true'
                     type: boolean
+                  excludeFromLoadBalancers:
+                    description: 'ExcludeFromLoadBalancers makes node termination
+                      handler will mark for exclusion from load balancers before node
+                      are cordoned. Default: false'
+                    type: boolean
                   managedASGTag:
                     description: ManagedASGTag is the tag used to determine which
                       nodes NTH can take action on

pkg/apis/kops/componentconfig.go

@@ -921,6 +921,9 @@ type NodeTerminationHandlerConfig struct {
 	// EnableRebalanceDraining makes node termination handler drain nodes when the rebalance recommendation notice is received
 	// Default: false
 	EnableRebalanceDraining *bool `json:"enableRebalanceDraining,omitempty"`
+	// ExcludeFromLoadBalancers makes node termination handler will mark for exclusion from load balancers before node are cordoned.
+	// Default: false
+	ExcludeFromLoadBalancers *bool `json:"excludeFromLoadBalancers,omitempty"`
 
 	// EnablePrometheusMetrics enables the "/metrics" endpoint.
 	EnablePrometheusMetrics *bool `json:"prometheusEnable,omitempty"`

pkg/apis/kops/v1alpha2/componentconfig.go

@@ -944,6 +944,9 @@ type NodeTerminationHandlerConfig struct {
 	// EnableRebalanceDraining makes node termination handler drain nodes when the rebalance recommendation notice is received
 	// Default: false
 	EnableRebalanceDraining *bool `json:"enableRebalanceDraining,omitempty"`
+	// ExcludeFromLoadBalancers makes node termination handler will mark for exclusion from load balancers before node are cordoned.
+	// Default: false
+	ExcludeFromLoadBalancers *bool `json:"excludeFromLoadBalancers,omitempty"`
 
 	// EnablePrometheusMetrics enables the "/metrics" endpoint.
 	EnablePrometheusMetrics *bool `json:"prometheusEnable,omitempty"`

pkg/apis/kops/v1alpha3/componentconfig.go

@@ -918,6 +918,9 @@ type NodeTerminationHandlerConfig struct {
 	// EnableRebalanceDraining makes node termination handler drain nodes when the rebalance recommendation notice is received
 	// Default: false
 	EnableRebalanceDraining *bool `json:"enableRebalanceDraining,omitempty"`
+	// ExcludeFromLoadBalancers makes node termination handler will mark for exclusion from load balancers before node are cordoned.
+	// Default: false
+	ExcludeFromLoadBalancers *bool `json:"excludeFromLoadBalancers,omitempty"`
 
 	// EnablePrometheusMetrics enables the "/metrics" endpoint.
 	EnablePrometheusMetrics *bool `json:"prometheusEnable,omitempty"`

pkg/model/components/nodeterminationhandler.go

@@ -51,6 +51,9 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o interface{}) error
 	if nth.EnableRebalanceDraining == nil {
 		nth.EnableRebalanceDraining = fi.Bool(false)
 	}
+	if nth.ExcludeFromLoadBalancers == nil {
+		nth.ExcludeFromLoadBalancers = fi.Bool(false)
+	}
 
 	if nth.EnablePrometheusMetrics == nil {
 		nth.EnablePrometheusMetrics = fi.Bool(false)
@@ -75,7 +78,7 @@ func (b *NodeTerminationHandlerOptionsBuilder) BuildOptions(o interface{}) error
 	}
 
 	if nth.Version == nil {
-		nth.Version = fi.String("v1.14.0")
+		nth.Version = fi.String("v1.16.0")
 	}
 
 	return nil

tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content

@@ -215,7 +215,7 @@ spec:
     managedASGTag: aws-node-termination-handler/managed
     memoryRequest: 64Mi
     prometheusEnable: false
-    version: v1.14.0
+    version: v1.16.0
   nonMasqueradeCIDR: 172.20.0.0/16
   podCIDR: 172.20.128.0/17
   secretStore: memfs://clusters.example.com/minimal.example.com/secrets

tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content

@@ -60,7 +60,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.11
     manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: b0be9a82a9215b10ce4aefa09589e86d754b7484722db7488a8cf3bbaa2ccc3f
+    manifestHash: 6e62a1c8571cb21128ad340359472875cda7091c13890a813f54c02a2cadeeab
     name: node-termination-handler.aws
     prune:
       kinds:

tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content

@@ -4,10 +4,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
     app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: v1.14.0
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
     k8s-app: aws-node-termination-handler
   name: aws-node-termination-handler
@@ -21,7 +23,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
   name: aws-node-termination-handler
 rules:
@@ -68,7 +75,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
   name: aws-node-termination-handler
 roleRef:
@@ -91,7 +103,7 @@ metadata:
     app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: v1.14.0
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
     k8s-app: aws-node-termination-handler
   name: aws-node-termination-handler
@@ -170,6 +182,8 @@ spec:
           value: "false"
         - name: TAINT_NODE
           value: "false"
+        - name: EXCLUDE_FROM_LOAD_BALANCERS
+          value: "false"
         - name: JSON_LOGGING
           value: "true"
         - name: ENABLE_PROMETHEUS_SERVER
@@ -193,7 +207,7 @@ spec:
           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.14.0
+        image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.0
         imagePullPolicy: IfNotPresent
         name: aws-node-termination-handler
         resources:

tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_cluster-completed.spec_content

@@ -225,7 +225,7 @@ spec:
     managedASGTag: aws-node-termination-handler/managed
     memoryRequest: 64Mi
     prometheusEnable: false
-    version: v1.14.0
+    version: v1.16.0
   nonMasqueradeCIDR: 172.20.0.0/16
   podCIDR: 172.20.128.0/17
   secretStore: memfs://clusters.example.com/minimal.example.com/secrets

tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content

@@ -67,7 +67,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.11
     manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: b0be9a82a9215b10ce4aefa09589e86d754b7484722db7488a8cf3bbaa2ccc3f
+    manifestHash: 6e62a1c8571cb21128ad340359472875cda7091c13890a813f54c02a2cadeeab
     name: node-termination-handler.aws
     prune:
       kinds:

tests/integration/update_cluster/many-addons-ccm-irsa23/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content

@@ -4,10 +4,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
     app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: v1.14.0
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
     k8s-app: aws-node-termination-handler
   name: aws-node-termination-handler
@@ -21,7 +23,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
   name: aws-node-termination-handler
 rules:
@@ -68,7 +75,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
   name: aws-node-termination-handler
 roleRef:
@@ -91,7 +103,7 @@ metadata:
     app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: v1.14.0
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
     k8s-app: aws-node-termination-handler
   name: aws-node-termination-handler
@@ -170,6 +182,8 @@ spec:
           value: "false"
         - name: TAINT_NODE
           value: "false"
+        - name: EXCLUDE_FROM_LOAD_BALANCERS
+          value: "false"
         - name: JSON_LOGGING
           value: "true"
         - name: ENABLE_PROMETHEUS_SERVER
@@ -193,7 +207,7 @@ spec:
           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.14.0
+        image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.0
         imagePullPolicy: IfNotPresent
         name: aws-node-termination-handler
         resources:

tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content

@@ -214,7 +214,7 @@ spec:
     managedASGTag: aws-node-termination-handler/managed
     memoryRequest: 64Mi
     prometheusEnable: false
-    version: v1.14.0
+    version: v1.16.0
   nonMasqueradeCIDR: 172.20.0.0/16
   podCIDR: 172.20.128.0/17
   secretStore: memfs://clusters.example.com/minimal.example.com/secrets

tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content

@@ -60,7 +60,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.11
     manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: bbdad2ac50bd56f8e8c0333fa0e26cea5434fc6621ba981b239ed52f62be2cee
+    manifestHash: fcddbd34a97f88271341cf1f73c8610094d1daf79771436643a4bbdf2eee61e4
     name: node-termination-handler.aws
     prune:
       kinds:

tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content

@@ -4,10 +4,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
     app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: v1.14.0
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
     k8s-app: aws-node-termination-handler
   name: aws-node-termination-handler
@@ -21,7 +23,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
   name: aws-node-termination-handler
 rules:
@@ -68,7 +75,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
   name: aws-node-termination-handler
 roleRef:
@@ -91,7 +103,7 @@ metadata:
     app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: v1.14.0
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
     k8s-app: aws-node-termination-handler
   name: aws-node-termination-handler
@@ -175,6 +187,8 @@ spec:
           value: "false"
         - name: TAINT_NODE
           value: "false"
+        - name: EXCLUDE_FROM_LOAD_BALANCERS
+          value: "false"
         - name: JSON_LOGGING
           value: "true"
         - name: ENABLE_PROMETHEUS_SERVER
@@ -197,7 +211,7 @@ spec:
           value: "8080"
         - name: PROBES_SERVER_ENDPOINT
           value: /healthz
-        image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.14.0
+        image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.0
         imagePullPolicy: IfNotPresent
         name: aws-node-termination-handler
         resources:

tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content

@@ -205,7 +205,7 @@ spec:
     managedASGTag: aws-node-termination-handler/managed
     memoryRequest: 64Mi
     prometheusEnable: false
-    version: v1.14.0
+    version: v1.16.0
   nonMasqueradeCIDR: 172.20.0.0/16
   podCIDR: 172.20.128.0/17
   secretStore: memfs://clusters.example.com/minimal.example.com/secrets

tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content

@@ -60,7 +60,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.11
     manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: bbdad2ac50bd56f8e8c0333fa0e26cea5434fc6621ba981b239ed52f62be2cee
+    manifestHash: fcddbd34a97f88271341cf1f73c8610094d1daf79771436643a4bbdf2eee61e4
     name: node-termination-handler.aws
     prune:
       kinds:

tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-node-termination-handler.aws-k8s-1.11_content

@@ -4,10 +4,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
     app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: v1.14.0
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
     k8s-app: aws-node-termination-handler
   name: aws-node-termination-handler
@@ -21,7 +23,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
   name: aws-node-termination-handler
 rules:
@@ -68,7 +75,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
   name: aws-node-termination-handler
 roleRef:
@@ -91,7 +103,7 @@ metadata:
     app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: v1.14.0
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
     k8s-app: aws-node-termination-handler
   name: aws-node-termination-handler
@@ -175,6 +187,8 @@ spec:
           value: "false"
         - name: TAINT_NODE
           value: "false"
+        - name: EXCLUDE_FROM_LOAD_BALANCERS
+          value: "false"
         - name: JSON_LOGGING
           value: "true"
         - name: ENABLE_PROMETHEUS_SERVER
@@ -197,7 +211,7 @@ spec:
           value: "8080"
         - name: PROBES_SERVER_ENDPOINT
           value: /healthz
-        image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.14.0
+        image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.0
         imagePullPolicy: IfNotPresent
         name: aws-node-termination-handler
         resources:

tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content

@@ -170,7 +170,7 @@ spec:
     managedASGTag: aws-node-termination-handler/managed
     memoryRequest: 64Mi
     prometheusEnable: false
-    version: v1.14.0
+    version: v1.16.0
   nonMasqueradeCIDR: 100.64.0.0/10
   podCIDR: 100.96.0.0/11
   secretStore: memfs://clusters.example.com/nthsqsresources.longclustername.example.com/secrets

tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content

@@ -47,7 +47,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.11
     manifest: node-termination-handler.aws/k8s-1.11.yaml
-    manifestHash: e8aeccc2a21370e9579e49c153c5e46c92a3bc705bcc2545957133dadd395114
+    manifestHash: e37bd0e876b0b811ff0a4ec68e163ad919c16f1ec056bfc9243615f5b8493db4
     name: node-termination-handler.aws
     prune:
       kinds:
@@ -73,8 +73,6 @@ spec:
       - group: policy
         kind: PodDisruptionBudget
         labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops
-        namespaces:
-        - kube-system
       - group: rbac.authorization.k8s.io
         kind: ClusterRole
         labelSelector: addon.kops.k8s.io/name=node-termination-handler.aws,app.kubernetes.io/managed-by=kops

tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-node-termination-handler.aws-k8s-1.11_content

@@ -4,10 +4,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
     app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: v1.14.0
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
     k8s-app: aws-node-termination-handler
   name: aws-node-termination-handler
@@ -21,7 +23,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
   name: aws-node-termination-handler
 rules:
@@ -68,7 +75,12 @@ metadata:
   creationTimestamp: null
   labels:
     addon.kops.k8s.io/name: node-termination-handler.aws
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
   name: aws-node-termination-handler
 roleRef:
@@ -91,7 +103,7 @@ metadata:
     app.kubernetes.io/instance: aws-node-termination-handler
     app.kubernetes.io/managed-by: kops
     app.kubernetes.io/name: aws-node-termination-handler
-    app.kubernetes.io/version: v1.14.0
+    app.kubernetes.io/version: v1.16.0
     k8s-addon: node-termination-handler.aws
     k8s-app: aws-node-termination-handler
   name: aws-node-termination-handler
@@ -186,6 +198,8 @@ spec:
           value: "false"
         - name: ENABLE_SQS_TERMINATION_DRAINING
           value: "true"
+        - name: EXCLUDE_FROM_LOAD_BALANCERS
+          value: "false"
         - name: QUEUE_URL
           value: https://sqs.us-test-1.amazonaws.com/123456789012/nthsqsresources-longclustername-example-com-nth
         - name: PROMETHEUS_SERVER_PORT
@@ -208,7 +222,7 @@ spec:
           value: "true"
         - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS
           value: ""
-        image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.14.0
+        image: public.ecr.aws/aws-ec2/aws-node-termination-handler:v1.16.0
         imagePullPolicy: IfNotPresent
         name: aws-node-termination-handler
         resources:

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

@@ -1,5 +1,5 @@
 {{ with .NodeTerminationHandler }}
-# Sourced from https://github.com/aws/aws-node-termination-handler/releases/download/v1.14.0/all-resources.yaml
+# Sourced from https://github.com/aws/aws-node-termination-handler/releases/download/v1.16.0/all-resources.yaml
 ---
 # Source: aws-node-termination-handler/templates/serviceaccount.yaml
 apiVersion: v1
@@ -12,12 +12,20 @@ metadata:
     app.kubernetes.io/instance: aws-node-termination-handler
     k8s-app: aws-node-termination-handler
     app.kubernetes.io/version: "{{ .Version }}"
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
 ---
 # Source: aws-node-termination-handler/templates/clusterrole.yaml
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: aws-node-termination-handler
+  labels:
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
+    app.kubernetes.io/version: "{{ .Version }}"
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
 rules:
 - apiGroups:
   - ""
@@ -59,6 +67,12 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: aws-node-termination-handler
+  labels:
+    app.kubernetes.io/name: aws-node-termination-handler
+    app.kubernetes.io/instance: aws-node-termination-handler
+    app.kubernetes.io/version: "{{ .Version }}"
+    app.kubernetes.io/component: aws-node-termination-handler
+    app.kubernetes.io/part-of: aws-node-termination-handler
 subjects:
 - kind: ServiceAccount
   name: aws-node-termination-handler
@@ -183,6 +197,8 @@ spec:
               value: "false"
             - name: ENABLE_SQS_TERMINATION_DRAINING
               value: "true"
+            - name: EXCLUDE_FROM_LOAD_BALANCERS
+              value: "{{ .ExcludeFromLoadBalancers }}"
             - name: QUEUE_URL
               value: "{{ DefaultQueueName }}"
             - name: PROMETHEUS_SERVER_PORT
@@ -361,6 +377,8 @@ spec:
             value: "false"
           - name: TAINT_NODE
             value: "false"
+          - name: EXCLUDE_FROM_LOAD_BALANCERS
+            value: "{{ .ExcludeFromLoadBalancers }}"
           - name: JSON_LOGGING
             value: "true"
           - name: ENABLE_PROMETHEUS_SERVER