diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl index 454428a9324d0a0893305ec13cc4c656bfe8ffeb..69873201a3967f39b473e0dafa3858401c1687cd 100644 --- a/chart/templates/_helpers.tpl +++ b/chart/templates/_helpers.tpl @@ -145,3 +145,16 @@ 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/twistlock/values.yaml b/chart/templates/twistlock/values.yaml index 74d7e543f9bc42c269c2eab91e373ac5074eedee..d4c2310eb147652d0aaf5b9e204b65f37f6135df 100644 --- a/chart/templates/twistlock/values.yaml +++ b/chart/templates/twistlock/values.yaml @@ -31,6 +31,11 @@ istio: gateways: - istio-system/{{ default "public" .Values.twistlock.ingress.gateway }} +{{- if .Values.istio.enabled }} +annotations: + {{ include "istioAnnotation" . }} +{{- end }} + console: image: imagePullPolicy: {{ .Values.imagePullPolicy }} diff --git a/chart/values.yaml b/chart/values.yaml index 4e2c529bbb7ef1b9d3f8fd9531508770fff53ec8..aa02c049042919fbf76567728e51e44e844a0477 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -532,7 +532,7 @@ twistlock: git: repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/twistlock.git path: "./chart" - tag: "0.0.12-bb.0" + tag: "0.1.0-bb.0" # -- Flux reconciliation overrides specifically for the Twistlock Package flux: {}