From 81bc3e5ab505f8d3cdad42c939f0e8848306b540 Mon Sep 17 00:00:00 2001 From: Avi Moondra Date: Tue, 28 May 2024 17:18:31 +0100 Subject: [PATCH] update semverCompare target to include -0 patch (#176) --- charts/retool/Chart.yaml | 2 +- charts/retool/templates/_helpers.tpl | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/charts/retool/Chart.yaml b/charts/retool/Chart.yaml index c7bb09a..0ccc7f3 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.2.4 +version: 6.2.5 maintainers: - name: Retool Engineering email: engineering+helm@retool.com diff --git a/charts/retool/templates/_helpers.tpl b/charts/retool/templates/_helpers.tpl index a035539..e24f682 100644 --- a/charts/retool/templates/_helpers.tpl +++ b/charts/retool/templates/_helpers.tpl @@ -213,9 +213,7 @@ 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 -}} +{{- else if semverCompare ">= 3.6.11-0" .Values.image.tag -}} {{- $output = "1" -}} {{- else -}} {{- $output = "" -}} @@ -242,7 +240,7 @@ Usage: (include "retool.codeExecutor.enabled" .) {{- $output = "" -}} {{- 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" (include "retool.codeExecutor.image.tag" .) -}} +{{- else if semverCompare ">= 3.20.15-0" (include "retool.codeExecutor.image.tag" .) -}} {{- $output = "1" -}} {{- else -}} {{- $output = "" -}} @@ -325,9 +323,7 @@ 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 -}} + {{- else if semverCompare ">= 3.20.15-0" .Values.image.tag -}} {{- .Values.image.tag -}} {{- else -}} {{- "1.1.0" -}}