Merge pull request #203 from nirmata/autoweb-fixes

fixes in charts to accomodate disableautowebhookgeneration
nirmata · Dec 22, 2023 · cb1513f · cb1513f
2 parents 0d0da19 + 5d716de
commit cb1513f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/charts/enterprise-kyverno-operator/Chart.yaml b/charts/enterprise-kyverno-operator/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: nirmata-kyverno-operator
 description: Helm Chart for Enterprise Kyverno Operator
 type: application
-version: v0.3.11
-appVersion: v0.2.2
+version: v0.3.12
+appVersion: v0.2.3
 
 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png
 keywords:

diff --git a/charts/nirmata/Chart.yaml b/charts/nirmata/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 type: application
 name: kyverno
-version: 3.0.10
+version: 3.0.11
 appVersion: v1.10.6-n4k.nirmata.3
 icon: https://github.com/kyverno/kyverno/raw/main/img/logo.png
 description: Kubernetes Native Policy Management

diff --git a/charts/nirmata/templates/_helpers.tpl b/charts/nirmata/templates/_helpers.tpl
@@ -19,6 +19,9 @@
 {{- with .autoUpdateWebhooks -}}
   {{- $flags = append $flags (print "--autoUpdateWebhooks=" .enabled) -}}
 {{- end -}}
+{{- with .disableAutoWebhookGeneration -}}
+  {{- $flags = append $flags (print "--disableAutoWebhookGeneration=" .enabled) -}}
+{{- end -}}
 {{- with .backgroundScan -}}
   {{- $flags = append $flags (print "--backgroundScan=" .enabled) -}}
   {{- $flags = append $flags (print "--backgroundScanWorkers=" .backgroundScanWorkers) -}}

diff --git a/charts/nirmata/templates/admission-controller/deployment.yaml b/charts/nirmata/templates/admission-controller/deployment.yaml
@@ -197,6 +197,7 @@ spec:
             {{- include "kyverno.features.flags" (pick (mergeOverwrite .Values.features .Values.admissionController.featuresOverride)
               "admissionReports"
               "autoUpdateWebhooks"
+              "disableAutoWebhookGeneration"
               "configMapCaching"
               "deferredLoading"
               "dumpPayload"

diff --git a/charts/nirmata/templates/cleanup-controller/deployment.yaml b/charts/nirmata/templates/cleanup-controller/deployment.yaml
@@ -107,6 +107,7 @@ spec:
             {{- end }}
             {{- include "kyverno.features.flags" (pick (mergeOverwrite .Values.features .Values.cleanupController.featuresOverride)
               "deferredLoading"
+              "disableAutoWebhookGeneration"
               "dumpPayload"
               "logging"
             ) | nindent 12 }}

diff --git a/charts/nirmata/values.yaml b/charts/nirmata/values.yaml
@@ -364,6 +364,8 @@ features:
   autoUpdateWebhooks:
     # -- Enables the feature
     enabled: true
+  disableAutoWebhookGeneration:
+    enabled: true
   backgroundScan:
     # -- Enables the feature
     enabled: true