Skip to content

Commit d20a1ab

Browse files
fix: correct helm templating issue
1 parent 6801474 commit d20a1ab

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

charts/tailscale-operator/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ name: tailscale-operator
1515
sources:
1616
- https://github.com/tailscale/tailscale
1717
type: application
18-
version: 1.70.1
18+
version: 1.70.2

charts/tailscale-operator/templates/deployment.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ spec:
3535
{{- toYaml . | nindent 8 }}
3636
{{- end }}
3737
volumes:
38-
{{- if .Values.operatorConfig.secretStore.enabled -}}
38+
{{- if .Values.operatorConfig.secretStore.enabled }}
3939
- name: oauth
4040
csi:
4141
driver: secrets-store.csi.k8s.io
4242
readOnly: true
4343
volumeAttributes:
44-
secretProviderClass: {{ .Values.operatorConfig.secretStore.secretStore }}
45-
{{- else -}}
44+
secretProviderClass: {{ .Values.operatorConfig.secretStore.name }}
45+
{{- else }}
4646
- name: oauth
4747
secret:
4848
secretName: operator-oauth
49-
{{- end -}}
49+
{{- end }}
5050
containers:
5151
- name: operator
5252
{{- with .Values.operatorConfig.securityContext }}
@@ -74,17 +74,17 @@ spec:
7474
fieldRef:
7575
fieldPath: metadata.namespace
7676
- name: CLIENT_ID_FILE
77-
{{- if .Values.operatorConfig.secretStore.enabled -}}
77+
{{- if .Values.operatorConfig.secretStore.enabled }}
7878
value: /oauth/{{ .Values.operatorConfig.secretStore.paths.clientId }}
79-
{{- else -}}
79+
{{- else }}
8080
value: /oauth/client_id
81-
{{- end -}}
81+
{{- end }}
8282
- name: CLIENT_SECRET_FILE
83-
{{- if .Values.operatorConfig.secretStore.enabled -}}
83+
{{- if .Values.operatorConfig.secretStore.enabled }}
8484
value: /oauth/{{ .Values.operatorConfig.secretStore.paths.clientSecret }}
85-
{{- else -}}
85+
{{- else }}
8686
value: /oauth/client_secret
87-
{{- end -}}
87+
{{- end }}
8888
{{- $proxyTag := printf ":%s" ( .Values.proxyConfig.image.tag | default .Chart.AppVersion )}}
8989
- name: PROXY_IMAGE
9090
value: {{ coalesce .Values.proxyConfig.image.repo .Values.proxyConfig.image.repository }}{{- if .Values.proxyConfig.image.digest -}}{{ printf "@%s" .Values.proxyConfig.image.digest}}{{- else -}}{{ printf "%s" $proxyTag }}{{- end }}

charts/tailscale-operator/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ operatorConfig:
5050

5151
secretStore:
5252
enabled: false
53-
secretStore: operator-oauth
53+
name: operator-oauth
5454
paths:
5555
clientId: clientId
5656
clientSecret: clientSecret

0 commit comments

Comments
 (0)