rm global

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
anushkamittal2001 · Feb 1, 2024 · ecc203d · ecc203d
1 parent 7fc7529
commit ecc203d
Show file tree

Hide file tree

Showing 41 changed files with 43 additions and 43 deletions.
diff --git a/charts/kyverno/charts/crds/templates/background-scan-reports.yaml b/charts/kyverno/charts/crds/templates/background-scan-reports.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq .Values.global.reportsController.enabled true) (eq .Values.backgroundscanreports false) }}
+{{- if and (eq .Values.reportsController.enabled true) (eq .Values.backgroundscanreports false) }}
 {{- fail "CRD backgroundscanreports disabled while reportsController enabled" }}
 {{- end }}
 

diff --git a/charts/kyverno/charts/crds/templates/cleanup-policies.yaml b/charts/kyverno/charts/crds/templates/cleanup-policies.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq .Values.global.cleanupController.enabled true) (eq .Values.cleanuppolicies false) }}
+{{- if and (eq .Values.cleanupController.enabled true) (eq .Values.cleanuppolicies false) }}
 {{- fail "CRD cleanuppolicies disabled while cleanupController enabled" }}
 {{- end }}
 

diff --git a/charts/kyverno/charts/crds/templates/cluster-background-scan-reports.yaml b/charts/kyverno/charts/crds/templates/cluster-background-scan-reports.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq .Values.global.reportsController.enabled true) (eq .Values.clusterbackgroundscanreports false) }}
+{{- if and (eq .Values.reportsController.enabled true) (eq .Values.clusterbackgroundscanreports false) }}
 {{- fail "CRD backgroundscanreports disabled while reportsController enabled" }}
 {{- end }}
 

diff --git a/charts/kyverno/charts/crds/templates/cluster-cleanup-policies.yaml b/charts/kyverno/charts/crds/templates/cluster-cleanup-policies.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq .Values.global.cleanupController.enabled true) (eq .Values.clustercleanuppolicies false) }}
+{{- if and (eq .Values.cleanupController.enabled true) (eq .Values.clustercleanuppolicies false) }}
 {{- fail "CRD clustercleanuppolicies disabled while cleanupController enabled" }}
 {{- end }}
 

diff --git a/charts/kyverno/charts/crds/templates/cluster-policy-reports.yaml b/charts/kyverno/charts/crds/templates/cluster-policy-reports.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq .Values.global.reportsController.enabled true) (eq .Values.clusterpolicyreports false) }}
+{{- if and (eq .Values.reportsController.enabled true) (eq .Values.clusterpolicyreports false) }}
 {{- fail "CRD clusterpolicyreports disabled while reportsController enabled" }}
 {{- end }}
 

diff --git a/charts/kyverno/charts/crds/templates/policy-reports.yaml b/charts/kyverno/charts/crds/templates/policy-reports.yaml
@@ -1,4 +1,4 @@
-{{- if and (eq .Values.global.reportsController.enabled true) (eq .Values.policyreports false) }}
+{{- if and (eq .Values.reportsController.enabled true) (eq .Values.policyreports false) }}
 {{- fail "CRD policyreports disabled while reportsController enabled" }}
 {{- end }}
 

diff --git a/charts/kyverno/templates/NOTES.txt b/charts/kyverno/templates/NOTES.txt
@@ -8,13 +8,13 @@ The following components have been installed in your cluster:
 - CRDs
 {{- end }}
 - Admission controller
-{{- if .Values.global.reportsController.enabled }}
+{{- if .Values.reportsController.enabled }}
 - Reports controller
 {{- end }}
-{{- if .Values.global.cleanupController.enabled }}
+{{- if .Values.cleanupController.enabled }}
 - Cleanup controller
 {{- end }}
-{{- if .Values.global.backgroundController.enabled }}
+{{- if .Values.backgroundController.enabled }}
 - Background controller
 {{- end }}
 {{- if .Values.grafana.enabled }}

diff --git a/charts/kyverno/templates/background-controller/clusterrole.yaml b/charts/kyverno/templates/background-controller/clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.backgroundController.enabled -}}
+{{- if .Values.backgroundController.enabled -}}
 {{- if .Values.backgroundController.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/charts/kyverno/templates/background-controller/clusterrolebinding.yaml b/charts/kyverno/templates/background-controller/clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.backgroundController.enabled -}}
+{{- if .Values.backgroundController.enabled -}}
 {{- if .Values.backgroundController.rbac.create -}}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/charts/kyverno/templates/background-controller/deployment.yaml b/charts/kyverno/templates/background-controller/deployment.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.backgroundController.enabled -}}
+{{- if .Values.backgroundController.enabled -}}
 {{- if not .Values.templating.debug -}}
 apiVersion: apps/v1
 kind: Deployment

diff --git a/charts/kyverno/templates/background-controller/networkpolicy.yaml b/charts/kyverno/templates/background-controller/networkpolicy.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.backgroundController.enabled -}}
+{{- if .Values.backgroundController.enabled -}}
 {{- if .Values.backgroundController.networkPolicy.enabled -}}
 {{- if .Values.backgroundController.metricsService.create -}}
 apiVersion: networking.k8s.io/v1

diff --git a/charts/kyverno/templates/background-controller/poddisruptionbudget.yaml b/charts/kyverno/templates/background-controller/poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.backgroundController.enabled -}}
+{{- if .Values.backgroundController.enabled -}}
 {{- if or .Values.backgroundController.podDisruptionBudget.enabled (gt (int .Values.backgroundController.replicas) 1) -}}
 apiVersion: {{ template "kyverno.pdb.apiVersion" . }}
 kind: PodDisruptionBudget

diff --git a/charts/kyverno/templates/background-controller/role.yaml b/charts/kyverno/templates/background-controller/role.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.backgroundController.enabled -}}
+{{- if .Values.backgroundController.enabled -}}
 {{- if .Values.backgroundController.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

diff --git a/charts/kyverno/templates/background-controller/rolebinding.yaml b/charts/kyverno/templates/background-controller/rolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.backgroundController.enabled -}}
+{{- if .Values.backgroundController.enabled -}}
 {{- if .Values.backgroundController.rbac.create -}}
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/charts/kyverno/templates/background-controller/service.yaml b/charts/kyverno/templates/background-controller/service.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.backgroundController.enabled -}}
+{{- if .Values.backgroundController.enabled -}}
 {{- if .Values.backgroundController.metricsService.create -}}
 ---
 apiVersion: v1

diff --git a/charts/kyverno/templates/background-controller/serviceaccount.yaml b/charts/kyverno/templates/background-controller/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.backgroundController.enabled -}}
+{{- if .Values.backgroundController.enabled -}}
 {{- if .Values.backgroundController.rbac.create -}}
 apiVersion: v1
 kind: ServiceAccount

diff --git a/charts/kyverno/templates/background-controller/servicemonitor.yaml b/charts/kyverno/templates/background-controller/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.backgroundController.enabled -}}
+{{- if .Values.backgroundController.enabled -}}
 {{- if .Values.backgroundController.serviceMonitor.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

diff --git a/charts/kyverno/templates/cleanup-controller/clusterrole.yaml b/charts/kyverno/templates/cleanup-controller/clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 {{- if .Values.cleanupController.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/charts/kyverno/templates/cleanup-controller/clusterrolebinding.yaml b/charts/kyverno/templates/cleanup-controller/clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 {{- if .Values.cleanupController.rbac.create -}}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/charts/kyverno/templates/cleanup-controller/deployment.yaml b/charts/kyverno/templates/cleanup-controller/deployment.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 {{- if not .Values.templating.debug -}}
 apiVersion: apps/v1
 kind: Deployment

diff --git a/charts/kyverno/templates/cleanup-controller/networkpolicy.yaml b/charts/kyverno/templates/cleanup-controller/networkpolicy.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 {{- if .Values.cleanupController.networkPolicy.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy

diff --git a/charts/kyverno/templates/cleanup-controller/poddisruptionbudget.yaml b/charts/kyverno/templates/cleanup-controller/poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 {{- if or .Values.cleanupController.podDisruptionBudget.enabled (gt (int .Values.cleanupController.replicas) 1) -}}
 apiVersion: {{ template "kyverno.pdb.apiVersion" . }}
 kind: PodDisruptionBudget

diff --git a/charts/kyverno/templates/cleanup-controller/role.yaml b/charts/kyverno/templates/cleanup-controller/role.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 {{- if .Values.cleanupController.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

diff --git a/charts/kyverno/templates/cleanup-controller/rolebinding.yaml b/charts/kyverno/templates/cleanup-controller/rolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 {{- if .Values.cleanupController.rbac.create -}}
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/charts/kyverno/templates/cleanup-controller/secret.yaml b/charts/kyverno/templates/cleanup-controller/secret.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 {{- if .Values.cleanupController.createSelfSignedCert -}}
 {{- $ca := genCA (printf "*.%s.svc" (include "kyverno.namespace" .)) 1024 -}}
 {{- $svcName := (printf "%s.%s.svc" (include "kyverno.cleanup-controller.name" .) (include "kyverno.namespace" .)) -}}

diff --git a/charts/kyverno/templates/cleanup-controller/serviceaccount.yaml b/charts/kyverno/templates/cleanup-controller/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 {{- if .Values.cleanupController.rbac.create -}}
 apiVersion: v1
 kind: ServiceAccount

diff --git a/charts/kyverno/templates/cleanup-controller/servicemonitor.yaml b/charts/kyverno/templates/cleanup-controller/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 {{- if .Values.cleanupController.serviceMonitor.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

diff --git a/charts/kyverno/templates/reports-controller/clusterrole.yaml b/charts/kyverno/templates/reports-controller/clusterrole.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.reportsController.enabled -}}
+{{- if .Values.reportsController.enabled -}}
 {{- if .Values.reportsController.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

diff --git a/charts/kyverno/templates/reports-controller/clusterrolebinding.yaml b/charts/kyverno/templates/reports-controller/clusterrolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.reportsController.enabled -}}
+{{- if .Values.reportsController.enabled -}}
 {{- if .Values.reportsController.rbac.create -}}
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/charts/kyverno/templates/reports-controller/deployment.yaml b/charts/kyverno/templates/reports-controller/deployment.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.reportsController.enabled -}}
+{{- if .Values.reportsController.enabled -}}
 {{- if not .Values.templating.debug -}}
 apiVersion: apps/v1
 kind: Deployment

diff --git a/charts/kyverno/templates/reports-controller/networkpolicy.yaml b/charts/kyverno/templates/reports-controller/networkpolicy.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.reportsController.enabled -}}
+{{- if .Values.reportsController.enabled -}}
 {{- if .Values.reportsController.networkPolicy.enabled -}}
 {{- if .Values.reportsController.metricsService.create -}}
 apiVersion: networking.k8s.io/v1

diff --git a/charts/kyverno/templates/reports-controller/poddisruptionbudget.yaml b/charts/kyverno/templates/reports-controller/poddisruptionbudget.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.reportsController.enabled -}}
+{{- if .Values.reportsController.enabled -}}
 {{- if or .Values.reportsController.podDisruptionBudget.enabled (gt (int .Values.reportsController.replicas) 1) -}}
 apiVersion: {{ template "kyverno.pdb.apiVersion" . }}
 kind: PodDisruptionBudget

diff --git a/charts/kyverno/templates/reports-controller/role.yaml b/charts/kyverno/templates/reports-controller/role.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.reportsController.enabled -}}
+{{- if .Values.reportsController.enabled -}}
 {{- if .Values.reportsController.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

diff --git a/charts/kyverno/templates/reports-controller/rolebinding.yaml b/charts/kyverno/templates/reports-controller/rolebinding.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.reportsController.enabled -}}
+{{- if .Values.reportsController.enabled -}}
 {{- if .Values.reportsController.rbac.create -}}
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/charts/kyverno/templates/reports-controller/service.yaml b/charts/kyverno/templates/reports-controller/service.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.reportsController.enabled -}}
+{{- if .Values.reportsController.enabled -}}
 {{- if .Values.reportsController.metricsService.create -}}
 ---
 apiVersion: v1

diff --git a/charts/kyverno/templates/reports-controller/serviceaccount.yaml b/charts/kyverno/templates/reports-controller/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.reportsController.enabled -}}
+{{- if .Values.reportsController.enabled -}}
 {{- if .Values.reportsController.rbac.create -}}
 apiVersion: v1
 kind: ServiceAccount

diff --git a/charts/kyverno/templates/reports-controller/servicemonitor.yaml b/charts/kyverno/templates/reports-controller/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.reportsController.enabled -}}
+{{- if .Values.reportsController.enabled -}}
 {{- if .Values.reportsController.serviceMonitor.enabled -}}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor

diff --git a/charts/kyverno/templates/tests/cleanup-controller-liveness.yaml b/charts/kyverno/templates/tests/cleanup-controller-liveness.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 apiVersion: v1
 kind: Pod
 metadata:

diff --git a/charts/kyverno/templates/tests/cleanup-controller-metrics.yaml b/charts/kyverno/templates/tests/cleanup-controller-metrics.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.global.cleanupController.enabled .Values.cleanupController.metricsService.create -}}
+{{- if and .Values.cleanupController.enabled .Values.cleanupController.metricsService.create -}}
 apiVersion: v1
 kind: Pod
 metadata:

diff --git a/charts/kyverno/templates/tests/cleanup-controller-readiness.yaml b/charts/kyverno/templates/tests/cleanup-controller-readiness.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.global.cleanupController.enabled -}}
+{{- if .Values.cleanupController.enabled -}}
 apiVersion: v1
 kind: Pod
 metadata:

diff --git a/charts/kyverno/templates/tests/reports-controller-metrics.yaml b/charts/kyverno/templates/tests/reports-controller-metrics.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.global.reportsController.enabled .Values.reportsController.metricsService.create -}}
+{{- if and .Values.reportsController.enabled .Values.reportsController.metricsService.create -}}
 apiVersion: v1
 kind: Pod
 metadata: