Merge branch 'gitlab-istio-injection-for-jobs' into 'master'

Gitlab istio injection for jobs

Closes platform-one/big-bang/apps/developer-tools/gitlab#109, platform-one/big-bang/apps/developer-tools/gitlab#110, and platform-one/big-bang/apps/developer-tools/gitlab#108

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

chart/templates/gitlab/values.yaml

@@ -12,6 +12,7 @@ openshift: {{ .Values.openshift }}
 
 istio:
   enabled: {{ .Values.istio.enabled }}
+  injection: {{ dig "istio" "injection" "enabled" .Values.addons.gitlab }}
   gitlab:
     gateways:
     - istio-system/{{ default "public" .Values.addons.gitlab.ingress.gateway }}
@@ -46,12 +47,6 @@ registry:
   {{- end }}
 {{- end }}
 
-{{- if .Values.istio.enabled }}
-shared-secrets:
-  annotations:
-    sidecar.istio.io/inject: "false"
-{{- end }}
-
 gitlab:
   {{- if .Values.addons.gitlab.objectStorage.endpoint }}
   task-runner:
@@ -75,18 +70,13 @@ gitlab:
     annotations: 
       iam.amazonaws.com/role: {{ .Values.addons.gitlab.objectStorage.iamProfile }}
   {{- end }}
-
-  {{- if .Values.istio.enabled }}
-  migrations:
-    annotations:
-      sidecar.istio.io/inject: "false"
-  {{- end }}
-  
+ 
 global:
 
   # added to help with Gitlab sub-chart configuration
   istio:
     enabled: {{ .Values.istio.enabled }}
+    injection: {{ dig "istio" "injection" "enabled" .Values.addons.gitlab }}
 
   hosts:
     domain: {{ $domainName }}

chart/values.yaml

@@ -591,7 +591,7 @@ addons:
     postRenderers: []
 
   gitlab:
-    # -- Toggle deployment of Gitlab 
+    # -- Toggle deployment of Gitlab
     enabled: false
 
     hostnames:
@@ -602,7 +602,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab.git
       path: "./chart"
-      tag: "5.3.1-bb.5"
+      tag: "5.3.1-bb.9"
 
     # -- Flux reconciliation overrides specifically for the Gitlab Package
     flux: {}
@@ -683,7 +683,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/developer-tools/gitlab-runner.git
       path: "./chart"
-      tag: "0.33.1-bb.4"
+      tag: "0.33.1-bb.5"
 
     # -- Flux reconciliation overrides specifically for the Gitlab Runner Package
     flux: {}