From 78fbf5d12017342b599755cffc64e0d58c820959 Mon Sep 17 00:00:00 2001 From: Matt Westrik Date: Thu, 22 Jan 2026 15:40:18 -0800 Subject: [PATCH 1/3] Only use semverCompare with valid versions --- charts/retool/templates/_helpers.tpl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/charts/retool/templates/_helpers.tpl b/charts/retool/templates/_helpers.tpl index 0f7d9cb1..fde306d2 100644 --- a/charts/retool/templates/_helpers.tpl +++ b/charts/retool/templates/_helpers.tpl @@ -251,7 +251,8 @@ Usage: (include "retool.workflows.enabled" .) {{- define "retool.workflows.enabled" -}} {{- $output := "" -}} {{- $valid_retool_version_regexp := "([0-9]+\\.[0-9]+(\\.[0-9]+)?(-[a-zA-Z0-9]+)?)" }} -{{- $retool_version_with_workflows := ( and ( regexMatch $valid_retool_version_regexp $.Values.image.tag ) ( semverCompare ">= 3.6.11-0" ( regexFind $valid_retool_version_regexp $.Values.image.tag ) ) ) }} +{{- $semver_version_regexp := "[0-9]+\\.[0-9]+(\\.[0-9]+)?" }} +{{- $retool_version_with_workflows := ( and ( regexMatch $valid_retool_version_regexp $.Values.image.tag ) ( semverCompare ">= 3.6.11-0" ( regexFind $semver_version_regexp $.Values.image.tag ) ) ) }} {{- if or (eq (toString .Values.workflows.enabled) "true") (eq (toString .Values.workflows.enabled) "false") @@ -385,7 +386,8 @@ Usage: (template "retool.codeExecutor.image.tag" .) {{- define "retool.codeExecutor.image.tag" -}} {{- if .Values.image.tag -}} {{- $valid_retool_version_regexp := "([0-9]+\\.[0-9]+(\\.[0-9]+)?(-[a-zA-Z0-9]+)?)" }} - {{- $retool_version_with_ce := ( and ( regexMatch $valid_retool_version_regexp $.Values.image.tag ) ( semverCompare ">= 3.20.15-0" ( regexFind $valid_retool_version_regexp $.Values.image.tag ) ) ) }} + {{- $semver_version_regexp := "[0-9]+\\.[0-9]+(\\.[0-9]+)?" }} + {{- $retool_version_with_ce := ( and ( regexMatch $valid_retool_version_regexp $.Values.image.tag ) ( semverCompare ">= 3.20.15-0" ( regexFind $semver_version_regexp $.Values.image.tag ) ) ) }} {{- if $retool_version_with_ce -}} {{- .Values.image.tag -}} {{- else -}} @@ -399,9 +401,10 @@ Usage: (template "retool.codeExecutor.image.tag" .) {{- define "retool_version_with_java_dbconnector_opt_out" -}} {{- $output := "" -}} {{- $valid_retool_version_regexp := "([0-9]+\\.[0-9]+(\\.[0-9]+)?(-[a-zA-Z0-9]+)?)" }} +{{- $semver_version_regexp := "[0-9]+\\.[0-9]+(\\.[0-9]+)?" }} {{- if not ( regexMatch $valid_retool_version_regexp .Values.image.tag ) -}} {{- $output = "1" -}} -{{- else if semverCompare ">= 3.93.0-0" ( regexFind $valid_retool_version_regexp .Values.image.tag ) -}} +{{- else if semverCompare ">= 3.93.0-0" ( regexFind $semver_version_regexp .Values.image.tag ) -}} {{- $output = "1" -}} {{- else -}} {{- $output = "" -}} From eb48a4199c6824f374923e3835da35f928690c05 Mon Sep 17 00:00:00 2001 From: Jason Gao Date: Thu, 9 Apr 2026 11:51:57 -0400 Subject: [PATCH 2/3] Fix semverCompare for image.tag in deployment_jobs.yaml Apply the same regexFind fix to the remaining semverCompare call on .Values.image.tag in deployment_jobs.yaml, so tags with leading-zero prerelease segments (e.g. 3.284.10-0360315) are handled correctly. Co-Authored-By: Claude Opus 4.6 --- charts/retool/templates/deployment_jobs.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/retool/templates/deployment_jobs.yaml b/charts/retool/templates/deployment_jobs.yaml index da512fa8..632e3c38 100644 --- a/charts/retool/templates/deployment_jobs.yaml +++ b/charts/retool/templates/deployment_jobs.yaml @@ -190,7 +190,8 @@ spec: {{ toYaml .Values.resources | indent 10 }} {{- end }} {{- if regexMatch "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" .Values.image.tag }} - {{- if semverCompare ">=2.110.0-0" .Values.image.tag }} + {{- $semver_version_regexp := "[0-9]+\\.[0-9]+(\\.[0-9]+)?" }} + {{- if semverCompare ">=2.110.0-0" (regexFind $semver_version_regexp .Values.image.tag) }} livenessProbe: httpGet: path: /api/checkJobsRunnerHealth From d32919c1113a6cbd253b784feffac486b31d220c Mon Sep 17 00:00:00 2001 From: Jason Gao Date: Thu, 9 Apr 2026 11:59:25 -0400 Subject: [PATCH 3/3] Bump chart version to 6.10.2 Co-Authored-By: Claude Opus 4.6 --- charts/retool/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml index 7879b7a5..d3e6b9bb 100644 --- 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.10.1 +version: 6.10.2 maintainers: - name: Retool Engineering email: engineering+helm@retool.com