Merge branch 'twistlock-istio-annotate2' into 'master'

Add Istio Version to Twistlock

Closes #965

See merge request platform-one/big-bang/bigbang!1164

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 -}}

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 }}

chart/values.yaml

@@ -528,7 +528,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: {}