From 15a9f019c6d060e18eed9299c508138e80819a9a Mon Sep 17 00:00:00 2001
From: Jimmy Bourque <jbourque@bridgephase.com>
Date: Wed, 26 Mar 2025 16:27:49 -0500
Subject: [PATCH 1/2] Updated umbrella template to use helpers
---
chart/templates/kyverno-reporter/helmrelease.yaml | 4 ++++
chart/templates/kyverno-reporter/namespace.yaml | 2 +-
chart/templates/kyverno-reporter/values.yaml | 6 +++---
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/chart/templates/kyverno-reporter/helmrelease.yaml b/chart/templates/kyverno-reporter/helmrelease.yaml
index 5e33739c3b..126375f9fb 100644
--- a/chart/templates/kyverno-reporter/helmrelease.yaml
+++ b/chart/templates/kyverno-reporter/helmrelease.yaml
@@ -69,4 +69,8 @@ spec:
- name: istio
namespace: {{ .Release.Namespace }}
{{- end }}
+ {{- if .Values.istioCore.enabled }}
+ - name: istio-core
+ namespace: {{ .Release.Namespace }}
+ {{- end }}
{{- end }}
diff --git a/chart/templates/kyverno-reporter/namespace.yaml b/chart/templates/kyverno-reporter/namespace.yaml
index e4dded9b6e..9f69375919 100644
--- a/chart/templates/kyverno-reporter/namespace.yaml
+++ b/chart/templates/kyverno-reporter/namespace.yaml
@@ -7,6 +7,6 @@ metadata:
app.kubernetes.io/name: {{ $pkg | kebabcase }}
app.kubernetes.io/component: "core"
{{- include "commonLabels" . | nindent 4}}
- istio-injection: {{ ternary "enabled" "disabled" (and .Values.istio.enabled (eq (dig "istio" "injection" "enabled" (get .Values $pkg)) "enabled")) }}
+ istio-injection: {{ ternary "enabled" "disabled" (and (eq (include "istioEnabled" .) "true") (eq (dig "istio" "injection" "enabled" (get .Values $pkg)) "enabled")) }}
name: kyverno-reporter
{{- end }}
\ No newline at end of file
diff --git a/chart/templates/kyverno-reporter/values.yaml b/chart/templates/kyverno-reporter/values.yaml
index f415f7c9cc..f509ea5b47 100644
--- a/chart/templates/kyverno-reporter/values.yaml
+++ b/chart/templates/kyverno-reporter/values.yaml
@@ -14,7 +14,7 @@ image:
imagePullSecrets:
- name: private-registry
-{{- if .Values.istio.enabled }}
+{{- if (eq (include "istioEnabled" .) "true") }}
istio:
enabled: true
podAnnotations:
@@ -26,7 +26,7 @@ kyvernoPlugin:
pullPolicy: {{ .Values.imagePullPolicy }}
imagePullSecrets:
- name: private-registry
- {{- if .Values.istio.enabled }}
+ {{- if (eq (include "istioEnabled" .) "true") }}
podAnnotations:
{{ include "istioAnnotation" . }}
{{- end }}
@@ -36,7 +36,7 @@ ui:
pullPolicy: {{ .Values.imagePullPolicy }}
imagePullSecrets:
- name: private-registry
- {{- if .Values.istio.enabled }}
+ {{- if (eq (include "istioEnabled" .) "true") }}
podAnnotations:
{{ include "istioAnnotation" . }}
{{- end }}
--
GitLab
From ae9833b10a9f182c44d0e4343779dee8d7f16b94 Mon Sep 17 00:00:00 2001
From: Jimmy Bourque <jbourque@bridgephase.com>
Date: Thu, 27 Mar 2025 14:57:10 -0500
Subject: [PATCH 2/2] Updated monitoring section to use helper
---
chart/templates/kyverno-reporter/values.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chart/templates/kyverno-reporter/values.yaml b/chart/templates/kyverno-reporter/values.yaml
index f509ea5b47..b5f99187ab 100644
--- a/chart/templates/kyverno-reporter/values.yaml
+++ b/chart/templates/kyverno-reporter/values.yaml
@@ -45,7 +45,7 @@ monitoring:
enabled: {{ .Values.monitoring.enabled }}
grafana:
namespace: monitoring
- {{- if .Values.istio.enabled }}
+ {{- if (eq (include "istioEnabled" .) "true") }}
serviceMonitor:
scheme: https
tlsConfig:
--
GitLab