diff --git a/stable/aws-node-termination-handler/Chart.yaml b/stable/aws-node-termination-handler/Chart.yaml index ee909a537..81e698cb9 100644 --- a/stable/aws-node-termination-handler/Chart.yaml +++ b/stable/aws-node-termination-handler/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: aws-node-termination-handler description: A Helm chart for the AWS Node Termination Handler -version: 0.13.0 -appVersion: 1.11.0 +version: 0.13.1 +appVersion: 1.11.1 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/stable/aws-node-termination-handler/README.md b/stable/aws-node-termination-handler/README.md index c37fef6a0..e5ce08222 100644 --- a/stable/aws-node-termination-handler/README.md +++ b/stable/aws-node-termination-handler/README.md @@ -71,6 +71,7 @@ Parameter | Description | Default `cordonOnly` | If true, nodes will be cordoned but not drained when an interruption event occurs. | `false` `taintNode` | If true, nodes will be tainted when an interruption event occurs. Currently used taint keys are `aws-node-termination-handler/scheduled-maintenance`, `aws-node-termination-handler/spot-itn`, and `aws-node-termination-handler/asg-lifecycle-termination` | `false` `jsonLogging` | If true, use JSON-formatted logs instead of human readable logs. | `false` +`logLevel` | Sets the log level (INFO, DEBUG, or ERROR) | `INFO` `enablePrometheusServer` | If true, start an http server exposing `/metrics` endpoint for prometheus. | `false` `prometheusServerPort` | Replaces the default HTTP port for exposing prometheus metrics. | `9092` `podMonitor.create` | if `true`, create a PodMonitor | `false` diff --git a/stable/aws-node-termination-handler/templates/daemonset.linux.yaml b/stable/aws-node-termination-handler/templates/daemonset.linux.yaml index 53e46479a..1b3b08f3c 100644 --- a/stable/aws-node-termination-handler/templates/daemonset.linux.yaml +++ b/stable/aws-node-termination-handler/templates/daemonset.linux.yaml @@ -43,7 +43,7 @@ spec: hostPath: path: {{ .Values.procUptimeFile | default "/proc/uptime" | quote }} {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: "webhookTemplate" + - name: "webhook-template" configMap: name: {{ .Values.webhookTemplateConfigMapName }} {{- end }} @@ -91,7 +91,7 @@ spec: mountPath: {{ .Values.procUptimeFile | default "/proc/uptime" | quote }} readOnly: true {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} - - name: "webhookTemplate" + - name: "webhook-template" mountPath: "/config/" {{- end }} env: @@ -156,6 +156,8 @@ spec: value: {{ .Values.taintNode | quote }} - name: JSON_LOGGING value: {{ .Values.jsonLogging | quote }} + - name: LOG_LEVEL + value: {{ .Values.logLevel | quote }} - name: WEBHOOK_PROXY value: {{ .Values.webhookProxy | quote }} - name: UPTIME_FROM_FILE diff --git a/stable/aws-node-termination-handler/templates/daemonset.windows.yaml b/stable/aws-node-termination-handler/templates/daemonset.windows.yaml index aa4b15f10..5f3d71dd4 100644 --- a/stable/aws-node-termination-handler/templates/daemonset.windows.yaml +++ b/stable/aws-node-termination-handler/templates/daemonset.windows.yaml @@ -40,7 +40,7 @@ spec: spec: {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} volumes: - - name: "webhookTemplate" + - name: "webhook-template" configMap: name: {{ .Values.webhookTemplateConfigMapName }} {{- end }} @@ -72,7 +72,7 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} {{- if and .Values.webhookTemplateConfigMapName .Values.webhookTemplateConfigMapKey }} volumeMounts: - - name: "webhookTemplate" + - name: "webhook-template" mountPath: "/config/" {{- end }} env: @@ -130,6 +130,8 @@ spec: value: {{ .Values.taintNode | quote }} - name: JSON_LOGGING value: {{ .Values.jsonLogging | quote }} + - name: LOG_LEVEL + value: {{ .Values.logLevel | quote }} - name: WEBHOOK_PROXY value: {{ .Values.webhookProxy | quote }} - name: UPTIME_FROM_FILE diff --git a/stable/aws-node-termination-handler/templates/deployment.yaml b/stable/aws-node-termination-handler/templates/deployment.yaml index e1f94f915..d6b3e8549 100644 --- a/stable/aws-node-termination-handler/templates/deployment.yaml +++ b/stable/aws-node-termination-handler/templates/deployment.yaml @@ -112,6 +112,8 @@ spec: value: {{ .Values.taintNode | quote }} - name: JSON_LOGGING value: {{ .Values.jsonLogging | quote }} + - name: LOG_LEVEL + value: {{ .Values.logLevel | quote }} - name: WEBHOOK_PROXY value: {{ .Values.webhookProxy | quote }} - name: ENABLE_PROMETHEUS_SERVER diff --git a/stable/aws-node-termination-handler/values.yaml b/stable/aws-node-termination-handler/values.yaml index fc6313e8b..a91e5ccd0 100644 --- a/stable/aws-node-termination-handler/values.yaml +++ b/stable/aws-node-termination-handler/values.yaml @@ -4,7 +4,7 @@ image: repository: amazon/aws-node-termination-handler - tag: v1.11.0 + tag: v1.11.1 pullPolicy: IfNotPresent pullSecrets: [] @@ -76,6 +76,9 @@ taintNode: false # Log messages in JSON format. jsonLogging: false +# Sets the log level +logLevel: "info" + # dryRun tells node-termination-handler to only log calls to kubernetes control plane dryRun: false