Merge branch '2613-Kyverno-Reporter-IstioCore' into 'master'

Resolve "Update Umbrella Template for Kyverno Reporter"

See merge request !5963

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 }}

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

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 }}
@@ -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: