Skip to content

Commit 649239b

Browse files
Fix shouldIncludeConfigSecretsEnvVars output format (#209)
Co-authored-by: retool-bot <retool-bot@retool.com>
1 parent 2791c21 commit 649239b

File tree

8 files changed

+14
-8
lines changed

8 files changed

+14
-8
lines changed

charts/retool/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: retool
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 6.3.3
5+
version: 6.3.4
66
maintainers:
77
- name: Retool Engineering
88
email: engineering+helm@retool.com

charts/retool/templates/_helpers.tpl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,5 +356,11 @@ Usage: (template "retool.codeExecutor.image.tag" .)
356356
Checks whether or not ExternalSecret definitions are enabled and can potentially clobber secrets or explicitly allow additional direct secret refs.
357357
*/}}
358358
{{- define "shouldIncludeConfigSecretsEnvVars" -}}
359-
{{- or (not (or (.Values.externalSecrets.enabled) (.Values.externalSecrets.externalSecretsOperator.enabled))) .Values.includeConfigSecrets -}}
359+
{{- $output := "" -}}
360+
{{- if or (not (or (.Values.externalSecrets.enabled) (.Values.externalSecrets.externalSecretsOperator.enabled))) .Values.externalSecrets.includeConfigSecrets -}}
361+
{{- $output = "1" -}}
362+
{{- else -}}
363+
{{- $output = "" -}}
364+
{{- end -}}
365+
{{- $output -}}
360366
{{- end -}}

charts/retool/templates/deployment_backend.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ spec:
153153

154154
{{- include "retool.telemetry.includeEnvVars" . | nindent 10 }}
155155

156-
{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
156+
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
157157
- name: LICENSE_KEY
158158
valueFrom:
159159
secretKeyRef:

charts/retool/templates/deployment_jobs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ spec:
9191

9292
{{- include "retool.telemetry.includeEnvVars" . | nindent 10 }}
9393

94-
{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
94+
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
9595
- name: LICENSE_KEY
9696
valueFrom:
9797
secretKeyRef:

charts/retool/templates/deployment_telemetry.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
value: "/host/proc"
5353
- name: SYSFS_ROOT
5454
value: "/host/sys"
55-
{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
55+
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
5656
- name: LICENSE_KEY
5757
valueFrom:
5858
secretKeyRef:

charts/retool/templates/deployment_workflows.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ spec:
141141
- name: CODE_EXECUTOR_INGRESS_DOMAIN
142142
value: http://{{ template "retool.codeExecutor.name" . }}
143143
{{- end }}
144-
{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
144+
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
145145
- name: LICENSE_KEY
146146
valueFrom:
147147
secretKeyRef:

charts/retool/templates/deployment_workflows_worker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ spec:
150150
- name: OTEL_EXPORTER_OTLP_ENDPOINT
151151
value: "http://$(HOST_IP):4317"
152152
{{- end }}
153-
{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
153+
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
154154
- name: LICENSE_KEY
155155
valueFrom:
156156
secretKeyRef:

charts/retool/templates/secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if (include "shouldIncludeConfigSecretsEnvVars" .) }}
1+
{{- if include "shouldIncludeConfigSecretsEnvVars" . }}
22
apiVersion: v1
33
kind: Secret
44
metadata:

0 commit comments

Comments
 (0)