Add extra environment variables in deployment template (tailscale#12858…

…) (#4) Cherry-pick 32ce187 from upstream main
coreweave · Aug 13, 2024 · 303d4f4 · 303d4f4
2 parents 1db75b8 + a1811dc
commit 303d4f4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/cmd/k8s-operator/deploy/chart/templates/deployment.yaml b/cmd/k8s-operator/deploy/chart/templates/deployment.yaml
@@ -79,7 +79,10 @@ spec:
               value: {{ .Values.proxyConfig.firewallMode }}
             {{- if .Values.proxyConfig.defaultProxyClass }}
             - name: PROXY_DEFAULT_CLASS
+            {{- end }}
               value: {{ .Values.proxyConfig.defaultProxyClass }}
+            {{- with .Values.operatorConfig.extraEnv }}
+            {{- toYaml . | nindent 12 }}
             {{- end }}
           volumeMounts:
           - name: oauth

diff --git a/cmd/k8s-operator/deploy/chart/values.yaml b/cmd/k8s-operator/deploy/chart/values.yaml
@@ -48,6 +48,13 @@ operatorConfig:
 
   securityContext: {}
 
+  extraEnv: []
+  # - name: EXTRA_VAR1
+  #   value: "value1"
+  # - name: EXTRA_VAR2
+  #   value: "value2"
+
+
 # proxyConfig contains configuraton that will be applied to any ingress/egress
 # proxies created by the operator.
 # https://tailscale.com/kb/1236/kubernetes-operator/#cluster-ingress