more robust tpl function

tryretool · Sep 15, 2023 · f48fa0a · f48fa0a
1 parent d6e8f5e
commit f48fa0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/charts/retool/templates/_helpers.tpl b/charts/retool/templates/_helpers.tpl
@@ -129,6 +129,10 @@ Set Workflows enabled
 {{- define "retool.workflows.enabled" -}}
 {{- if or (eq .Values.workflows.enabled true) (eq .Values.workflows.enabled false) -}}
   {{- .Values.workflows.enabled | default false }}
+{{- else if empty .Values.image.tag }}
+  {{- false }}
+{{- else if eq .Values.image.tag "latest" }}
+  {{- true }}
 {{- else }}
   {{- semverCompare ">= 3.6.11" .Values.image.tag }}
 {{- end }}

diff --git a/charts/retool/templates/secret.yaml b/charts/retool/templates/secret.yaml
@@ -46,7 +46,7 @@ data:
   postgresql-password: {{ .Values.config.postgresql.password | default "" | b64enc | quote }}
   {{ end }}
 
-  {{ if and ((include "retool.workflows.enabled" .) | include "strToBool" ) .Values.workflows.temporal.sslKey }}
+  {{ if .Values.workflows.temporal.sslKey }}
   temporal-tls-key: {{ .Values.workflows.temporal.sslKey | default "" | b64enc | quote }}
   {{ end }}