diff --git a/chart/templates/anchore/namespace.yaml b/chart/templates/anchore/namespace.yaml index 9ccc37a4b8658be69f49e1807db3ba18b5808591..2d7cf7a7663bc9b80e3fdf80906c9dcca554af60 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: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" .Values.addons.anchore) "enabled")) }} + istio-injection: {{ ternary "enabled" "disabled" (and (include "istioEnabled" .) (eq (dig "istio" "injection" "enabled" .Values.addons.anchore) "enabled")) }} name: anchore -{{- end }} \ No newline at end of file +{{- end }} diff --git a/chart/templates/anchore/values.yaml b/chart/templates/anchore/values.yaml index e64e0530ff4833f63911e2d7320b451360858f68..50418a8ac13befc9674932a550d38c9ac389c9e1 100644 --- a/chart/templates/anchore/values.yaml +++ b/chart/templates/anchore/values.yaml @@ -10,7 +10,7 @@ domain: {{ $domainName }} openshift: {{ .Values.openshift }} istio: - enabled: {{ .Values.istio.enabled }} + enabled: {{ include "istioEnabled" . }} hardened: enabled: {{ or (dig "istio" "hardened" "enabled" false .Values.addons.anchore.values) @@ -19,10 +19,10 @@ istio: 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 }} + - {{ include "istioGatewayNamespace" . }}/{{ default (include "istioPublicGateway" . ) .Values.addons.anchore.ingress.gateway }} api: gateways: - - istio-system/{{ default "public" .Values.addons.anchore.ingress.gateway }} + - {{ include "istioGatewayNamespace" . }}/{{ default (include "istioPublicGateway" . ) .Values.addons.anchore.ingress.gateway }} monitoring: enabled: {{ .Values.monitoring.enabled }} @@ -40,6 +40,8 @@ monitoring: networkPolicies: enabled: {{ .Values.networkPolicies.enabled }} + istioNamespaceSelector: + {{ include "istioNamespaceSelector" . | nindent 4 }} ingressLabels: {{- $gateway := default "public" .Values.addons.anchore.ingress.gateway }} {{- $default := dict "app" (dig "gateways" $gateway "ingressGateway" nil .Values.istio) "istio" nil }} diff --git a/chart/values.yaml b/chart/values.yaml index 6db06da899ae483073f8483280383f55520da6ec..7d68075e45fe4735fe32ea728b5f3088a8c2326b 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1663,11 +1663,11 @@ addons: git: repo: https://repo1.dso.mil/big-bang/product/packages/anchore-enterprise.git path: "./chart" - tag: "3.5.0-bb.0" + tag: "3.5.0-bb.1" helmRepo: repoName: "registry1" chartName: "anchore" - tag: "3.5.0-bb.0" + tag: "3.5.0-bb.1" # -- Flux reconciliation overrides specifically for the Anchore Package flux: