[fix] code executor image tag reference for internal tags (#161)

tryretool · Mar 20, 2024 · a9c4696 · a9c4696
1 parent 4774c21
commit a9c4696
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: retool
 description: A Helm chart for Kubernetes
 type: application
-version: 6.1.0
+version: 6.1.1
 maintainers:
   - name: Retool Engineering
     email: [email protected]

diff --git a/charts/retool/templates/_helpers.tpl b/charts/retool/templates/_helpers.tpl
@@ -178,7 +178,6 @@ Set Code Executor enabled
 Usage: (include "retool.codeExecutor.enabled" .)
 */}}
 {{- define "retool.codeExecutor.enabled" -}}
-{{- $codeExecutorVersion := (include "retool.codeExecutor.image.tag" .) -}}
 {{- $output := "" -}}
 {{- if or
     (eq (toString .Values.codeExecutor.enabled) "true")
@@ -189,11 +188,11 @@ Usage: (include "retool.codeExecutor.enabled" .)
   {{- else -}}
     {{- $output = "" -}}
   {{- end -}}
-{{- else if empty $codeExecutorVersion -}}
+{{- else if empty (include "retool.codeExecutor.image.tag" .) -}}
   {{- $output = "" -}}
-{{- else if (or (contains "stable" $codeExecutorVersion) (contains "edge" $codeExecutorVersion)) -}}
+{{- else if (or (contains "stable" (include "retool.codeExecutor.image.tag" .)) (contains "edge" (include "retool.codeExecutor.image.tag" .))) -}}
   {{- $output = "1" -}}
-{{- else if semverCompare ">= 3.20.15" $codeExecutorVersion -}}
+{{- else if semverCompare ">= 3.20.15" (include "retool.codeExecutor.image.tag" .) -}}
   {{- $output = "1" -}}
 {{- else -}}
   {{- $output = "" -}}