Merge remote-tracking branch 'origin/master' into update-gitlab-to-14.6.0

chart/templates/vault/values.yaml

@@ -19,10 +19,18 @@ global:
   - name: private-registry
 
 injector:
+  {{- if .Values.istio.enabled }}
+  annotations:
+    {{ include "istioAnnotation" . }}
+  {{- end }}
   image:
     pullPolicy: {{ .Values.imagePullPolicy }}
 
 server:
+  {{- if .Values.istio.enabled }}
+  annotations:
+    {{ include "istioAnnotation" . }}
+  {{- end }}
   image:
     pullPolicy: {{ .Values.imagePullPolicy }}
 
@@ -45,5 +53,4 @@ istio:
   vault:
     gateways:
       - istio-system/{{ default "public" .Values.addons.vault.ingress.gateway }}
-
 {{- end -}}
\ No newline at end of file

chart/values.yaml

@@ -558,7 +558,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd.git
       path: "./chart"
-      tag: "3.27.1-bb.2"
+      tag: "3.27.1-bb.3"
 
     # -- Flux reconciliation overrides specifically for the ArgoCD Package
     flux: {}

tests/test-values.yaml

@@ -738,6 +738,7 @@ addons:
           envs:
             ANCHORE_CLI_URL: "https://anchore-api.bigbang.dev/v1"
             ANCHORE_CLI_USER: admin
+            ANCHORE_SCAN_IMAGE: registry.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise/centos:latest
           secretEnvs:
             - name: ANCHORE_CLI_PASS
               valueFrom: