Skip to content

Commit 303d4f4

Browse files
Add extra environment variables in deployment template (tailscale#12858) (#4)
Cherry-pick 32ce187 from upstream main
2 parents 1db75b8 + a1811dc commit 303d4f4

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

cmd/k8s-operator/deploy/chart/templates/deployment.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ spec:
7979
value: {{ .Values.proxyConfig.firewallMode }}
8080
{{- if .Values.proxyConfig.defaultProxyClass }}
8181
- name: PROXY_DEFAULT_CLASS
82+
{{- end }}
8283
value: {{ .Values.proxyConfig.defaultProxyClass }}
84+
{{- with .Values.operatorConfig.extraEnv }}
85+
{{- toYaml . | nindent 12 }}
8386
{{- end }}
8487
volumeMounts:
8588
- name: oauth

cmd/k8s-operator/deploy/chart/values.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@ operatorConfig:
4848

4949
securityContext: {}
5050

51+
extraEnv: []
52+
# - name: EXTRA_VAR1
53+
# value: "value1"
54+
# - name: EXTRA_VAR2
55+
# value: "value2"
56+
57+
5158
# proxyConfig contains configuraton that will be applied to any ingress/egress
5259
# proxies created by the operator.
5360
# https://tailscale.com/kb/1236/kubernetes-operator/#cluster-ingress

0 commit comments

Comments
 (0)