merge main

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
kyverno · Sep 27, 2023 · c91aeca · c91aeca
2 parents d477bba + 8d2b68d
commit c91aeca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/charts/kyverno/templates/_helpers/_deployment.tpl b/charts/kyverno/templates/_helpers/_deployment.tpl
@@ -1,8 +1,12 @@
 {{/* vim: set filetype=mustache: */}}
 
 {{- define "kyverno.deployment.replicas" -}}
-  {{- if eq (int (default 1 .)) 0 -}}
+  {{- if not (eq . nil) -}}
+  {{- if not (kindIs "string" .) -}}
+  {{- if eq (int .) 0 -}}
     {{- fail "Kyverno does not support running with 0 replicas. Please provide a non-zero integer value." -}}
   {{- end -}}
+  {{- end -}}
+  {{- end -}}
   {{- . -}}
 {{- end -}}
diff --git a/charts/kyverno/values.yaml b/charts/kyverno/values.yaml
@@ -450,10 +450,10 @@ features:
   tuf:
     # -- Enables the feature
     enabled: false
-    # -- Tuf root
-    root:
-    # -- Tuf mirror
-    mirror:
+    # -- (string) Tuf root
+    root: ~
+    # -- (string) Tuf mirror
+    mirror: ~
 
 # Cleanup cronjobs to prevent internal resources from stacking up in the cluster
 cleanupJobs: