diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 454428a9324d0a0893305ec13cc4c656bfe8ffeb..ea9b587123d8a944f43bf420960ce25178944126 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -145,3 +145,15 @@ bigbang.addValueIfSet can be used to nil check parameters before adding them to {{- end }} {{- end }} {{- end -}} +{{/* +Annotation for Istio version +*/}} +{{- define "istioAnnotation" -}} + {{- if .Values.istio.git.semver -}} + bigbang.dev/istioVersion: {{ .Values.istio.git.semver | trimSuffix (regexFind "-bb.*" .Values.istio.git.semver) }} + {{- else if .Values.istio.git.tag -}} + bigbang.dev/istioVersion: {{ .Values.istio.git.tag | trimSuffix (regexFind "-bb.*" .Values.istio.git.tag) }} + {{- else if .Values.istio.git.branch -}} + bigbang.dev/istioVersion: {{ .Values.istio.git.branch }} + {{- end -}} +{{- end -}} diff --git a/chart/templates/logging/eck-operator/values.yaml b/chart/templates/logging/eck-operator/values.yaml index b96d4500f89acc3a717d7a3c8a82c9ccad770ba0..77fae81fc23625e9e861bf254366af4cb7b1b77c 100644 --- a/chart/templates/logging/eck-operator/values.yaml +++ b/chart/templates/logging/eck-operator/values.yaml @@ -10,8 +10,11 @@ license: image: pullPolicy: {{ .Values.imagePullPolicy }} - + podAnnotations: +{{- if .Values.istio.enabled }} + {{ include "istioAnnotation" . }} +{{- end }} sidecar.istio.io/inject: "true" traffic.sidecar.istio.io/includeInboundPorts: "*" traffic.sidecar.istio.io/excludeInboundPorts: "9443"