From bef4a565c0efcca22ad916cd2d417c2598a5913e Mon Sep 17 00:00:00 2001 From: Jonathan Sherry Date: Tue, 24 Aug 2021 08:19:51 -0400 Subject: [PATCH] Add extraEnv to helm chart --- config/helm/aws-node-termination-handler/README.md | 1 + .../templates/daemonset.linux.yaml | 4 ++++ .../templates/daemonset.windows.yaml | 4 ++++ .../aws-node-termination-handler/templates/deployment.yaml | 4 ++++ config/helm/aws-node-termination-handler/values.yaml | 2 ++ 5 files changed, 15 insertions(+) diff --git a/config/helm/aws-node-termination-handler/README.md b/config/helm/aws-node-termination-handler/README.md index 34e8e0fd..bc0ae6c0 100644 --- a/config/helm/aws-node-termination-handler/README.md +++ b/config/helm/aws-node-termination-handler/README.md @@ -148,6 +148,7 @@ Parameter | Description | Default `updateStrategy` | Update strategy for the all DaemonSets (Linux and Windows) | `type=RollingUpdate,rollingUpdate.maxUnavailable=1` `linuxUpdateStrategy` | Update strategy for the Linux DaemonSet | `type=RollingUpdate,rollingUpdate.maxUnavailable=1` `windowsUpdateStrategy` | Update strategy for the Windows DaemonSet | `type=RollingUpdate,rollingUpdate.maxUnavailable=1` +`extraEnv` | Additional environment variables to inject into pod configuration | `[]` ### Testing Configuration (NOT RECOMMENDED FOR PROD DEPLOYMENTS) diff --git a/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml b/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml index 62c5e004..0a09aa64 100644 --- a/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml +++ b/config/helm/aws-node-termination-handler/templates/daemonset.linux.yaml @@ -176,6 +176,10 @@ spec: value: {{ .Values.emitKubernetesEvents | quote }} - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS value: {{ .Values.kubernetesEventsExtraAnnotations | quote }} +{{- range $key, $value := .Values.extraEnv }} + - name: {{ $key }} + value: {{ $value | quote }} +{{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- if or .Values.enablePrometheusServer .Values.enableProbesServer }} diff --git a/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml b/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml index 60aa13b5..d5dfa6f8 100644 --- a/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml +++ b/config/helm/aws-node-termination-handler/templates/daemonset.windows.yaml @@ -150,6 +150,10 @@ spec: value: {{ .Values.emitKubernetesEvents | quote }} - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS value: {{ .Values.kubernetesEventsExtraAnnotations | quote }} +{{- range $key, $value := .Values.extraEnv }} + - name: {{ $key }} + value: {{ $value | quote }} +{{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- if or .Values.enablePrometheusServer .Values.enableProbesServer }} diff --git a/config/helm/aws-node-termination-handler/templates/deployment.yaml b/config/helm/aws-node-termination-handler/templates/deployment.yaml index 70bdd95b..aa1fabd2 100644 --- a/config/helm/aws-node-termination-handler/templates/deployment.yaml +++ b/config/helm/aws-node-termination-handler/templates/deployment.yaml @@ -152,6 +152,10 @@ spec: value: {{ .Values.emitKubernetesEvents | quote }} - name: KUBERNETES_EVENTS_EXTRA_ANNOTATIONS value: {{ .Values.kubernetesEventsExtraAnnotations | quote }} +{{- range $key, $value := .Values.extraEnv }} + - name: {{ $key }} + value: {{ $value | quote }} +{{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} {{- if or .Values.enablePrometheusServer .Values.enableProbesServer }} diff --git a/config/helm/aws-node-termination-handler/values.yaml b/config/helm/aws-node-termination-handler/values.yaml index 2930c6fa..bd6323a6 100644 --- a/config/helm/aws-node-termination-handler/values.yaml +++ b/config/helm/aws-node-termination-handler/values.yaml @@ -15,6 +15,8 @@ securityContext: nameOverride: "" fullnameOverride: "" +extraEnv: [] + priorityClassName: system-node-critical podAnnotations: {}