diff --git a/chart/templates/kyverno-reporter/helmrelease.yaml b/chart/templates/kyverno-reporter/helmrelease.yaml index 5e33739c3b3ee1e0bdc9f06dbfc1fad22eb52330..126375f9fbdc135c9a61a98e1c7a94aea32aa52b 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 e4dded9b6e67b69769b5cdddc62cf5c7b76a48a0..9f69375919f4a11d0f86fdf0eaaac7261d89a9ec 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 f415f7c9cc1f31c81f3e0ef5bb84af4569f6cb25..b5f99187abc11e5bc9f0d46eaabc11d33d9bd6b3 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 }} @@ -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: