From 80ad66b34fa4f2304daff13697d94abaf1bf97b6 Mon Sep 17 00:00:00 2001 From: Mariam Fahmy Date: Mon, 18 Nov 2024 10:41:59 +0200 Subject: [PATCH] fix: use ephemeralreportsfor reports controller in helm (#11600) Signed-off-by: Mariam Fahmy Co-authored-by: shuting --- charts/kyverno/Chart.yaml | 4 +--- charts/kyverno/templates/validate.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/charts/kyverno/Chart.yaml b/charts/kyverno/Chart.yaml index 31d1b6c6d1..17501119fb 100644 --- a/charts/kyverno/Chart.yaml +++ b/charts/kyverno/Chart.yaml @@ -34,9 +34,7 @@ annotations: # valid kinds are: added, changed, deprecated, removed, fixed and security artifacthub.io/changes: | - kind: fixed - description: switch to post-delete helm hook to clean up Kyverno configmap - - kind: fixed - description: modify config.webhooks to be as a single object instead of a list of webhooks. + description: fix validation error in validate.yaml dependencies: - name: grafana version: v0.0.0 diff --git a/charts/kyverno/templates/validate.yaml b/charts/kyverno/templates/validate.yaml index 8fe085847c..ab4a5fcd97 100644 --- a/charts/kyverno/templates/validate.yaml +++ b/charts/kyverno/templates/validate.yaml @@ -7,14 +7,14 @@ {{- if and (eq .Values.reportsController.enabled true) (eq .Values.crds.groups.wgpolicyk8s.clusterpolicyreports false) }} {{- fail "CRD clusterpolicyreports disabled while reportsController enabled" }} {{- end }} -{{- if and (eq .Values.reportsController.enabled true) (eq .Values.crds.groups.wgpolicyk8s.clusterpolicyreports false) }} -{{- fail "CRD clusterpolicyreports disabled while reportsController enabled" }} +{{- if and (eq .Values.reportsController.enabled true) (eq .Values.crds.groups.wgpolicyk8s.policyreports false) }} +{{- fail "CRD policyreports disabled while reportsController enabled" }} {{- end }} -{{- if and (eq .Values.reportsController.enabled true) (eq .Values.crds.groups.kyverno.backgroundscanreports false) }} -{{- fail "CRD backgroundscanreports disabled while reportsController enabled" }} +{{- if and (eq .Values.reportsController.enabled true) (eq .Values.crds.groups.reports.ephemeralreports false) }} +{{- fail "CRD ephemeralreports disabled while reportsController enabled" }} {{- end }} -{{- if and (eq .Values.reportsController.enabled true) (eq .Values.crds.groups.kyverno.clusterbackgroundscanreports false) }} -{{- fail "CRD backgroundscanreports disabled while reportsController enabled" }} +{{- if and (eq .Values.reportsController.enabled true) (eq .Values.crds.groups.reports.clusterephemeralreports false) }} +{{- fail "CRD clusterephemeralreports disabled while reportsController enabled" }} {{- end }} {{- if hasKey .Values "mode" -}}