From 09491e5f13ce76321c81344100468d4f3b9c86ef Mon Sep 17 00:00:00 2001
From: kaymonty <kmontakhab@vivsoft.io>
Date: Mon, 17 Mar 2025 10:45:28 -0400
Subject: [PATCH 1/2] rebasing
---
chart/values.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chart/values.yaml b/chart/values.yaml
index 6db06da899..7d68075e45 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:
--
GitLab
From 72c75abbde2d4994cf13fad7bf01260f6a5e5c9b Mon Sep 17 00:00:00 2001
From: kaymonty <kmontakhab@vivsoft.io>
Date: Mon, 17 Mar 2025 10:19:25 -0400
Subject: [PATCH 2/2] required changes for templating
---
chart/templates/anchore/namespace.yaml | 4 ++--
chart/templates/anchore/values.yaml | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/chart/templates/anchore/namespace.yaml b/chart/templates/anchore/namespace.yaml
index 9ccc37a4b8..2d7cf7a766 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 e64e0530ff..50418a8ac1 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 }}
--
GitLab