node-termination-handler: v1.16.2 (#737)

Co-authored-by: ec2-bot 🤖 <[email protected]>
aws · Apr 21, 2022 · eead9f0 · eead9f0
1 parent 9726553
commit eead9f0
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 12 deletions.
diff --git a/stable/aws-node-termination-handler/Chart.yaml b/stable/aws-node-termination-handler/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: aws-node-termination-handler
 description: A Helm chart for the AWS Node Termination Handler.
 type: application
-version: 0.18.1
-appVersion: 1.16.1
+version: 0.18.2
+appVersion: 1.16.2
 kubeVersion: ">= 1.16-0"
 keywords:
   - aws

diff --git a/stable/aws-node-termination-handler/README.md b/stable/aws-node-termination-handler/README.md
@@ -113,6 +113,7 @@ The configuration in this table applies to AWS Node Termination Handler in queue
 | `checkASGTagBeforeDraining`  | If `true`, check that the instance is tagged with the `managedAsgTag` before draining the node.                                                                           | `true`                                 |
 | `managedAsgTag`              | The node tag to check if `checkASGTagBeforeDraining` is `true`.                                                                                                           | `aws-node-termination-handler/managed` |
 | `assumeAsgTagPropagation`    | If `true`, assume that ASG tags will be appear on the ASG's instances.                                                                                                    | `false`                                |
+| `useProviderId`    | If `true`, fetch node name through Kubernetes node spec ProviderID instead of AWS event PrivateDnsHostname.                                                                                                    | `false`                                |
 
 ### IMDS Mode Configuration
 

diff --git a/stable/aws-node-termination-handler/templates/_helpers.tpl b/stable/aws-node-termination-handler/templates/_helpers.tpl
@@ -48,7 +48,6 @@ Common labels
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
-app.kubernetes.io/component: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 helm.sh/chart: {{ include "aws-node-termination-handler.chart" . }}
@@ -57,6 +56,22 @@ helm.sh/chart: {{ include "aws-node-termination-handler.chart" . }}
 {{- end }}
 {{- end -}}
 
+{{/*
+Deployment labels
+*/}}
+{{- define "aws-node-termination-handler.labelsDeployment" -}}
+{{ include "aws-node-termination-handler.labels" . }}
+app.kubernetes.io/component: deployment
+{{- end -}}
+
+{{/*
+Daemonset labels
+*/}}
+{{- define "aws-node-termination-handler.labelsDaemonset" -}}
+{{ include "aws-node-termination-handler.labels" . }}
+app.kubernetes.io/component: daemonset
+{{- end -}}
+
 {{/*
 Selector labels
 */}}

diff --git a/stable/aws-node-termination-handler/templates/daemonset.linux.yaml b/stable/aws-node-termination-handler/templates/daemonset.linux.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "aws-node-termination-handler.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "aws-node-termination-handler.labels" . | nindent 4 }}
+    {{- include "aws-node-termination-handler.labelsDaemonset" . | nindent 4 }}
 spec:
   {{- with .Values.updateStrategy }}
   updateStrategy:

diff --git a/stable/aws-node-termination-handler/templates/daemonset.windows.yaml b/stable/aws-node-termination-handler/templates/daemonset.windows.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "aws-node-termination-handler.fullnameWindows" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "aws-node-termination-handler.labels" . | nindent 4 }}
+    {{- include "aws-node-termination-handler.labelsDaemonset" . | nindent 4 }}
 spec:
   {{- with .Values.updateStrategy }}
   updateStrategy:

diff --git a/stable/aws-node-termination-handler/templates/deployment.yaml b/stable/aws-node-termination-handler/templates/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "aws-node-termination-handler.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "aws-node-termination-handler.labels" . | nindent 4 }}
+    {{- include "aws-node-termination-handler.labelsDeployment" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicas }}
   {{- with .Values.strategy }}
@@ -88,6 +88,8 @@ spec:
               value: {{ .Values.managedAsgTag | quote }}
             - name: ASSUME_ASG_TAG_PROPAGATION
               value: {{ .Values.assumeAsgTagPropagation | quote }}
+            - name: USE_PROVIDER_ID
+              value: {{ .Values.useProviderId | quote }}
             - name: DRY_RUN
               value: {{ .Values.dryRun | quote }}
             - name: CORDON_ONLY
@@ -137,13 +139,13 @@ spec:
               value: {{ .Values.webhookTemplate | quote }}
             {{- end }}
             - name: ENABLE_SPOT_INTERRUPTION_DRAINING
-              value: "false"
+              value: {{ .Values.enableSpotInterruptionDraining | quote }}
             - name: ENABLE_SCHEDULED_EVENT_DRAINING
-              value: "false"
+              value: {{ .Values.enableScheduledEventDraining | quote }}
             - name: ENABLE_REBALANCE_MONITORING
-              value: "false"
+              value: {{ .Values.enableRebalanceMonitoring | quote }}
             - name: ENABLE_REBALANCE_DRAINING
-              value: "false"
+              value: {{ .Values.enableRebalanceDraining | quote }}
             - name: ENABLE_SQS_TERMINATION_DRAINING
               value: "true"
             {{- with .Values.awsRegion }}

diff --git a/stable/aws-node-termination-handler/templates/service.yaml b/stable/aws-node-termination-handler/templates/service.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "aws-node-termination-handler.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "aws-node-termination-handler.labels" . | nindent 4 }}
+    {{- include "aws-node-termination-handler.labelsDeployment" . | nindent 4 }}
 spec:
   type: ClusterIP
   selector:

diff --git a/stable/aws-node-termination-handler/templates/servicemonitor.yaml b/stable/aws-node-termination-handler/templates/servicemonitor.yaml
@@ -25,5 +25,5 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "aws-node-termination-handler.labels" . | nindent 6 }}
+      {{- include "aws-node-termination-handler.selectorLabelsDeployment" . | nindent 6 }}
 {{- end -}}
diff --git a/stable/aws-node-termination-handler/values.yaml b/stable/aws-node-termination-handler/values.yaml
@@ -179,6 +179,9 @@ managedAsgTag: "aws-node-termination-handler/managed"
 # If true, assume that ASG tags will be appear on the ASG's instances
 assumeAsgTagPropagation: false
 
+# If true, fetch node name through Kubernetes node spec ProviderID instead of AWS event PrivateDnsHostname.
+useProviderId: false
+
 # ---------------------------------------------------------------------------------------------------------------------
 # IMDS Mode
 # ---------------------------------------------------------------------------------------------------------------------