From 3b57aa12db2d9885f44e5d887af52a10e3b5b7dc Mon Sep 17 00:00:00 2001 From: Helmut Wolf Date: Fri, 14 Mar 2025 12:56:06 +0100 Subject: [PATCH] Close #992: Add tag support for .Values.tridentAutosupportImage, .Values.operatorImage, .Values.tridentImage --- helm/trident-operator/templates/_helpers.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm/trident-operator/templates/_helpers.tpl b/helm/trident-operator/templates/_helpers.tpl index b46e6a6ac..c9c035cbb 100644 --- a/helm/trident-operator/templates/_helpers.tpl +++ b/helm/trident-operator/templates/_helpers.tpl @@ -69,7 +69,7 @@ Trident operator image */}} {{- define "trident-operator.image" -}} {{- if .Values.operatorImage }} -{{- .Values.operatorImage }} +{{- .Values.operatorImage }}:{{ .Values.operatorImageTag | default .Chart.AppVersion }} {{- else if .Values.imageRegistry }} {{- .Values.imageRegistry }}/trident-operator:{{ .Values.operatorImageTag | default .Chart.AppVersion }} {{- else }} @@ -114,7 +114,7 @@ Trident AutoSupport image */}} {{- define "trident.autosupportImage" -}} {{- if .Values.tridentAutosupportImage }} -{{- .Values.tridentAutosupportImage }} +{{- .Values.tridentAutosupportImage }}:{{ .Values.tridentAutosupportImageTag | default .Chart.AppVersion | trunc 5}} {{- else if .Values.imageRegistry }} {{- .Values.imageRegistry }}/trident-autosupport:{{ .Values.tridentAutosupportImageTag | default .Chart.AppVersion | trunc 5}} {{- else }} @@ -188,7 +188,7 @@ Trident image */}} {{- define "trident.image" -}} {{- if .Values.tridentImage }} -{{- .Values.tridentImage }} +{{- .Values.tridentImage }}:{{ .Values.tridentImageTag | default .Chart.AppVersion }} {{- else if .Values.imageRegistry }} {{- .Values.imageRegistry }}/trident:{{ .Values.tridentImageTag | default .Chart.AppVersion }} {{- else }}