make CLIENT_SECRET ref optional

charts/retool/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-version: 6.8.6
+version: 6.8.7
 maintainers:
   - name: Retool Engineering
     email: engineering+helm@retool.com

charts/retool/templates/_workers.tpl

@@ -175,8 +175,10 @@ spec:
           {{- end }}
           - name: WORKFLOW_BACKEND_HOST
             value: http://{{ include "retool.workflowBackend.name" $ }}
+          {{- if $.Values.config.auth.google.enabled }}
           - name: CLIENT_ID
             value: {{ default "" $.Values.config.auth.google.clientId }}
+          {{- end }}
           - name: COOKIE_INSECURE
             value: {{ $.Values.config.useInsecureCookies | quote }}
           - name: POSTGRES_HOST
@@ -251,6 +253,7 @@ spec:
                 key: postgresql-password
                 {{- end }}
           {{- end }}
+          {{- if $.Values.config.auth.google.enabled }}
           - name: CLIENT_SECRET
             valueFrom:
               secretKeyRef:
@@ -262,6 +265,7 @@ spec:
                 key: google-client-secret
                 {{- end }}
           {{- end }}
+          {{- end }}
           {{- range $key, $value := $.Values.env }}
           - name: "{{ $key }}"
             value: "{{ $value }}"

charts/retool/templates/deployment_backend.yaml

@@ -105,8 +105,10 @@ spec:
           - name: DISABLE_JAVA_DBCONNECTOR
             value: "true"
           {{ end }}
+          {{- if .Values.config.auth.google.enabled }}
           - name: CLIENT_ID
             value: {{ default "" .Values.config.auth.google.clientId }}
+          {{- end }}
           - name: COOKIE_INSECURE
             value: {{ .Values.config.useInsecureCookies | quote }}
           - name: POSTGRES_HOST
@@ -231,6 +233,7 @@ spec:
                 key: postgresql-password
                 {{- end }}
           {{- end }}
+          {{- if .Values.config.auth.google.enabled }}
           - name: CLIENT_SECRET
             valueFrom:
               secretKeyRef:
@@ -242,6 +245,7 @@ spec:
                 key: google-client-secret
                 {{- end }}
           {{- end }}
+          {{- end }}
           {{- range $key, $value := .Values.env }}
           - name: "{{ $key }}"
             value: "{{ $value }}"

charts/retool/templates/deployment_dbconnector.yaml

@@ -88,8 +88,10 @@ spec:
             value: "true"
           - name: WORKFLOW_BACKEND_HOST
             value: http://{{ template "retool.fullname" . }}-workflow-backend
+          {{- if .Values.config.auth.google.enabled }}
           - name: CLIENT_ID
             value: {{ default "" .Values.config.auth.google.clientId }}
+          {{- end }}
           - name: COOKIE_INSECURE
             value: {{ .Values.config.useInsecureCookies | quote }}
 
@@ -150,6 +152,7 @@ spec:
                 key: postgresql-password
                 {{- end }}
               {{- end }}
+          {{- if .Values.config.auth.google.enabled }}
           - name: CLIENT_SECRET
             valueFrom:
               secretKeyRef:
@@ -161,6 +164,7 @@ spec:
                 key: google-client-secret
                 {{- end }}
           {{- end }}
+          {{- end }}
           {{- range $key, $value := .Values.env }}
           - name: "{{ $key }}"
             value: "{{ $value }}"

charts/retool/templates/deployment_jobs.yaml

@@ -74,8 +74,10 @@ spec:
             value: production
           - name: SERVICE_TYPE
             value: JOBS_RUNNER
+          {{- if .Values.config.auth.google.enabled }}
           - name: CLIENT_ID
             value: {{ default "" .Values.config.auth.google.clientId }}
+          {{- end }}
           - name: COOKIE_INSECURE
             value: {{ .Values.config.useInsecureCookies | quote }}
           - name: POSTGRES_HOST
@@ -137,6 +139,7 @@ spec:
                 key: postgresql-password
                 {{- end }}
           {{- end }}
+          {{- if .Values.config.auth.google.enabled }}
           - name: CLIENT_SECRET
             valueFrom:
               secretKeyRef:
@@ -148,6 +151,7 @@ spec:
                 key: google-client-secret
                 {{- end }}
           {{- end }}
+          {{- end }}
           {{- range $key, $value := .Values.env }}
           - name: "{{ $key }}"
             value: "{{ $value }}"

charts/retool/templates/deployment_workflows.yaml

@@ -148,8 +148,10 @@ spec:
 
           {{- include "retool.telemetry.includeEnvVars" . | nindent 10 }}
 
+          {{- if .Values.config.auth.google.enabled }}
           - name: CLIENT_ID
             value: {{ default "" .Values.config.auth.google.clientId }}
+          {{- end }}
           - name: COOKIE_INSECURE
             value: {{ .Values.config.useInsecureCookies | quote }}
           - name: POSTGRES_HOST
@@ -212,6 +214,7 @@ spec:
                 key: postgresql-password
                 {{- end }}
           {{- end }}
+          {{- if .Values.config.auth.google.enabled }}
           - name: CLIENT_SECRET
             valueFrom:
               secretKeyRef:
@@ -223,6 +226,7 @@ spec:
                 key: google-client-secret
                 {{- end }}
           {{- end }}
+          {{- end }}
           {{- range $key, $value := .Values.env }}
           - name: "{{ $key }}"
             value: "{{ $value }}"

charts/retool/values.yaml

@@ -14,6 +14,8 @@ config:
   postgresPoolMaxSize: 10
   auth:
     google:
+      # whether to populate CLIENT_ID and CLIENT_SECRET env vars (default: true for backwards compatibility)
+      enabled: true
       clientId:
       clientSecret:
       # clientSecretSecretName is the name of the secret where the google client secret is stored (can be used instead of clientSecret)

values.yaml

@@ -14,6 +14,8 @@ config:
   postgresPoolMaxSize: 10
   auth:
     google:
+      # whether to populate CLIENT_ID and CLIENT_SECRET env vars (default: true for backwards compatibility)
+      enabled: true
       clientId:
       clientSecret:
       # clientSecretSecretName is the name of the secret where the google client secret is stored (can be used instead of clientSecret)