diff --git a/packages/system/dashboard/Makefile b/packages/system/dashboard/Makefile index d76c56534..d69509373 100644 --- a/packages/system/dashboard/Makefile +++ b/packages/system/dashboard/Makefile @@ -31,7 +31,7 @@ build-console: $(call image-tags,cozystack-ui,v$(COZYSTACK_VERSION)) \ $(call cache-args,cozystack-ui) \ --metadata-file images/console.json \ - --build-arg APP_VERSION=$(COZYSTACK_VERSION) \ + --build-arg APP_VERSION=v$(COZYSTACK_VERSION) \ --push=$(PUSH) \ --label "org.opencontainers.image.source=https://github.com/cozystack/cozystack" \ --load=$(LOAD) diff --git a/packages/system/dashboard/templates/configmap.yaml b/packages/system/dashboard/templates/configmap.yaml index 365a19208..5b0441ef2 100644 --- a/packages/system/dashboard/templates/configmap.yaml +++ b/packages/system/dashboard/templates/configmap.yaml @@ -6,7 +6,9 @@ {{- $tag := .Values.console.image | toString | splitList "@" | first | splitList ":" | last }} {{- $config := merge (dict) $branding }} {{- if regexMatch "^v?[0-9]" $tag }} -{{- $_ := set $config "version" (trimPrefix "v" $tag) }} +{{- /* Keep the tag verbatim (vX.Y.Z), matching the operator's COZYSTACK_VERSION + and the vX.Y.Z release tags, rather than stripping the leading v. */}} +{{- $_ := set $config "version" $tag }} {{- end }} apiVersion: v1 kind: ConfigMap