fix: correct helm templating issue

skyloud · Aug 11, 2024 · d20a1ab · d20a1ab
1 parent 6801474
commit d20a1ab
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/charts/tailscale-operator/Chart.yaml b/charts/tailscale-operator/Chart.yaml
@@ -15,4 +15,4 @@ name: tailscale-operator
 sources:
 - https://github.com/tailscale/tailscale
 type: application
-version: 1.70.1
+version: 1.70.2
diff --git a/charts/tailscale-operator/templates/deployment.yaml b/charts/tailscale-operator/templates/deployment.yaml
@@ -35,18 +35,18 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
-      {{- if .Values.operatorConfig.secretStore.enabled -}}
+      {{- if .Values.operatorConfig.secretStore.enabled }}
       - name: oauth
         csi:
           driver: secrets-store.csi.k8s.io
           readOnly: true
           volumeAttributes:
-            secretProviderClass: {{ .Values.operatorConfig.secretStore.secretStore }}
-      {{- else -}}
+            secretProviderClass: {{ .Values.operatorConfig.secretStore.name }}
+      {{- else }}
       - name: oauth
         secret:
           secretName: operator-oauth
-      {{- end -}}
+      {{- end }}
       containers:
         - name: operator
           {{- with .Values.operatorConfig.securityContext }}
@@ -74,17 +74,17 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CLIENT_ID_FILE
-              {{- if .Values.operatorConfig.secretStore.enabled -}}
+              {{- if .Values.operatorConfig.secretStore.enabled }}
               value: /oauth/{{ .Values.operatorConfig.secretStore.paths.clientId }}
-              {{- else -}}
+              {{- else }}
               value: /oauth/client_id
-              {{- end -}}
+              {{- end }}
             - name: CLIENT_SECRET_FILE
-              {{- if .Values.operatorConfig.secretStore.enabled -}}
+              {{- if .Values.operatorConfig.secretStore.enabled }}
               value: /oauth/{{ .Values.operatorConfig.secretStore.paths.clientSecret }}
-              {{- else -}}
+              {{- else }}
               value: /oauth/client_secret
-              {{- end -}}
+              {{- end }}
             {{- $proxyTag := printf ":%s" ( .Values.proxyConfig.image.tag | default .Chart.AppVersion )}}
             - name: PROXY_IMAGE
               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 }}

diff --git a/charts/tailscale-operator/values.yaml b/charts/tailscale-operator/values.yaml
@@ -50,7 +50,7 @@ operatorConfig:
 
   secretStore:
     enabled: false
-    secretStore: operator-oauth
+    name: operator-oauth
     paths:
       clientId: clientId
       clientSecret: clientSecret