From d0711874f55a33053a63220200ca4a23cf0dfda0 Mon Sep 17 00:00:00 2001 From: Micah Nagel <micah.nagel@defenseunicorns.com> Date: Tue, 25 Jul 2023 19:40:27 +0000 Subject: [PATCH] Allow seamless sidecar cycling for enterprise Istio switch --- chart/templates/_helpers.tpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 9dd7502ea2..304c2b7656 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -153,14 +153,14 @@ Annotation for Istio version {{- define "istioAnnotation" -}} {{- if (eq .Values.istio.sourceType "git") -}} {{- if .Values.istio.git.semver -}} -bigbang.dev/istioVersion: {{ .Values.istio.git.semver | trimSuffix (regexFind "-bb.*" .Values.istio.git.semver) }} +bigbang.dev/istioVersion: {{ .Values.istio.git.semver | trimSuffix (regexFind "-bb.*" .Values.istio.git.semver) }}{{ if .Values.istio.enterprise }}-enterprise{{ end }} {{- else if .Values.istio.git.tag -}} -bigbang.dev/istioVersion: {{ .Values.istio.git.tag | trimSuffix (regexFind "-bb.*" .Values.istio.git.tag) }} +bigbang.dev/istioVersion: {{ .Values.istio.git.tag | trimSuffix (regexFind "-bb.*" .Values.istio.git.tag) }}{{ if .Values.istio.enterprise }}-enterprise{{ end }} {{- else if .Values.istio.git.branch -}} -bigbang.dev/istioVersion: {{ .Values.istio.git.branch }} +bigbang.dev/istioVersion: {{ .Values.istio.git.branch }}{{ if .Values.istio.enterprise }}-enterprise{{ end }} {{- end -}} {{- else -}} -bigbang.dev/istioVersion: {{ .Values.istio.helmRepo.tag }} +bigbang.dev/istioVersion: {{ .Values.istio.helmRepo.tag }}{{ if .Values.istio.enterprise }}-enterprise{{ end }} {{- end -}} {{- end -}} @@ -305,4 +305,4 @@ bigbang.dev/istioVersion: {{ .Values.istio.helmRepo.tag }} {{- if $cert -}} {{- printf "-----BEGIN CERTIFICATE-----\n%s\n-----END CERTIFICATE-----" $cert -}} {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} -- GitLab