diff --git a/chart/templates/anchore/namespace.yaml b/chart/templates/anchore/namespace.yaml index 6b49b10187a879c4a5b43d36eb1ff51a7b8d10b1..9ccc37a4b8658be69f49e1807db3ba18b5808591 100644 --- a/chart/templates/anchore/namespace.yaml +++ b/chart/templates/anchore/namespace.yaml @@ -6,6 +6,6 @@ metadata: app.kubernetes.io/name: anchore app.kubernetes.io/component: "security" {{- include "commonLabels" . | nindent 4}} - istio-injection: enabled + istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.anchore) "enabled")) }} name: anchore {{- end }} \ No newline at end of file diff --git a/chart/templates/anchore/values.yaml b/chart/templates/anchore/values.yaml index 4fd1e4ce679da312de94b5a6ea4553e2759dabb7..8a31e184149345070c379cb7cd0ba5e091d81399 100644 --- a/chart/templates/anchore/values.yaml +++ b/chart/templates/anchore/values.yaml @@ -9,6 +9,7 @@ domain: {{ $domainName }} istio: enabled: {{ .Values.istio.enabled }} + injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.anchore) "enabled")) }} ui: gateways: - istio-system/{{ default "public" .Values.addons.anchore.ingress.gateway }} diff --git a/chart/values.yaml b/chart/values.yaml index 8f0ba38139de4cf7b68011e60394dcc72509d9e7..d2c7075b692a74d30de0f6d5c865f29784a43ebd 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1023,7 +1023,7 @@ addons: git: repo: https://repo1.dso.mil/platform-one/big-bang/apps/security-tools/anchore-enterprise.git path: "./chart" - tag: "1.15.0-bb.8" + tag: "1.15.0-bb.10" # -- Flux reconciliation overrides specifically for the Anchore Package flux: