update helm chart to support stable + edge releases (#160)

tryretool · Mar 19, 2024 · 4774c21 · 4774c21
1 parent 7684ef7
commit 4774c21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 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.0.17
+version: 6.1.0
 maintainers:
   - name: Retool Engineering
     email: engineering+helm@retool.com

diff --git a/charts/retool/templates/_helpers.tpl b/charts/retool/templates/_helpers.tpl
@@ -163,6 +163,8 @@ Usage: (include "retool.workflows.enabled" .)
   {{- $output = "" -}}
 {{- else if eq .Values.image.tag "latest" -}}
   {{- $output = "1" -}}
+{{- else if (or (contains "stable" .Values.image.tag) (contains "edge" .Values.image.tag)) -}}
+  {{- $output = "1" -}}
 {{- else if semverCompare ">= 3.6.11" .Values.image.tag -}}
   {{- $output = "1" -}}
 {{- else -}}
@@ -176,6 +178,7 @@ 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")
@@ -186,9 +189,11 @@ Usage: (include "retool.codeExecutor.enabled" .)
   {{- else -}}
     {{- $output = "" -}}
   {{- end -}}
-{{- else if empty (include "retool.codeExecutor.image.tag" .) -}}
+{{- else if empty $codeExecutorVersion -}}
   {{- $output = "" -}}
-{{- else if semverCompare ">= 3.20.15" (include "retool.codeExecutor.image.tag" .) -}}
+{{- else if (or (contains "stable" $codeExecutorVersion) (contains "edge" $codeExecutorVersion)) -}}
+  {{- $output = "1" -}}
+{{- else if semverCompare ">= 3.20.15" $codeExecutorVersion -}}
   {{- $output = "1" -}}
 {{- else -}}
   {{- $output = "" -}}
@@ -249,6 +254,8 @@ Usage: (template "retool.codeExecutor.image.tag" .)
     {{- fail "If using image.tag=latest (not recommended, select an explicit tag instead) and enabling codeExecutor, explicitly set codeExecutor.image.tag" }}
   {{- else if (eq .Values.image.tag "latest") -}}
     {{- "" -}}
+  {{- else if (or (contains "stable" .Values.image.tag) (contains "edge" .Values.image.tag)) -}}
+    {{- .Values.image.tag -}}
   {{- else if semverCompare ">= 3.20.15" .Values.image.tag -}}
     {{- .Values.image.tag -}}
   {{- else -}}