Merge pull request #2151 from facchettos/webhook-eso

added clusterrole rule for eso and webhook
loft-sh · Sep 18, 2024 · 61b790e · 61b790e
2 parents 84d0a89 + 195f0f7
commit 61b790e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/chart/templates/clusterrole.yaml b/chart/templates/clusterrole.yaml
@@ -112,7 +112,7 @@ rules:
     resources: ["nodes"]
     verbs: ["get", "list"]
   {{- end }}
-  {{- if and .Values.integrations.kubeVirt.enabled .Values.integrations.kubeVirt.webhook.enabled }}
+  {{- if or (and .Values.integrations.kubeVirt.enabled .Values.integrations.kubeVirt.webhook.enabled) (and .Values.integrations.externalSecrets.enabled .Values.integrations.externalSecrets.webhook.enabled )  }}
   - apiGroups: ["admissionregistration.k8s.io"]
     resources: ["validatingwebhookconfigurations", "mutatingwebhookconfigurations"]
     verbs: ["get", "list", "watch"]

diff --git a/chart/tests/clusterrole_test.yaml b/chart/tests/clusterrole_test.yaml
@@ -302,6 +302,8 @@ tests:
       integrations:
         externalSecrets:
           enabled: true
+          webhook:
+            enabled: false
     release:
       name: my-release
       namespace: my-namespace
@@ -400,6 +402,8 @@ tests:
       integrations:
         externalSecrets:
           enabled: true
+          webhook:
+            enabled: true
           sync:
             clusterStores:
               enabled: true
@@ -409,9 +413,15 @@ tests:
     asserts:
       - hasDocuments:
           count: 1
+      - contains:
+          path: rules
+          content:
+            apiGroups: ["admissionregistration.k8s.io"]
+            resources: ["validatingwebhookconfigurations", "mutatingwebhookconfigurations"]
+            verbs: ["get", "list", "watch"]
       - contains:
           path: rules
           content:
             apiGroups: [ "external-secrets.io" ]
             resources: [ "clustersecretstores" ]
-            verbs: [ "get", "list", "watch" ]
+            verbs: ["get", "list", "watch"]