fix(charts): bump account-operator version to 0.6.1 and add webhook r…

…egistration flag
openmfp · Feb 17, 2025 · f5e72f0 · f5e72f0
1 parent 7731be6
commit f5e72f0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 88 deletions.
diff --git a/charts/account-operator/README.md b/charts/account-operator/README.md
@@ -35,6 +35,7 @@ A Helm chart to deploy OpenMFP Account-Operator
 | subroutines.namespace.enabled | bool | `true` | Enable namespace subroutines |
 | webhooks.certDir | string | `"/certs"` | The directory for webhook certificates |
 | webhooks.enabled | bool | `true` | Enable webhooks |
+| webhooks.register | bool | `false` | Register webhooks, flag to toggle if webhooks should be enabled on the runtime cluster |
 
 ## Overriding Values
 

diff --git a/charts/account-operator/templates/webhook/mutation-webhook.yaml b/charts/account-operator/templates/webhook/mutation-webhook.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.webhooks.enabled -}}
+{{- if and .Values.webhooks.enabled .Values.webhooks.register -}}
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:

diff --git a/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap b/charts/account-operator/tests/__snapshot__/deployment_test.yaml.snap
@@ -398,40 +398,13 @@ operator match the snapshot:
     metadata:
       name: account-operator
   6: |
-    apiVersion: admissionregistration.k8s.io/v1
-    kind: MutatingWebhookConfiguration
-    metadata:
-      annotations:
-        cert-manager.io/inject-ca-from: NAMESPACE/account-operator-serving-cert
-      name: account-operator-mutating-webhook-configuration
-    webhooks:
-      - admissionReviewVersions:
-          - v1
-        clientConfig:
-          service:
-            name: account-operator-webhook
-            namespace: NAMESPACE
-            path: /mutate-core-openmfp-io-v1alpha1-account
-        failurePolicy: Fail
-        name: maccount.kb.io
-        rules:
-          - apiGroups:
-              - core.openmfp.io
-            apiVersions:
-              - v1alpha1
-            operations:
-              - CREATE
-            resources:
-              - accounts
-        sideEffects: None
-  7: |
     apiVersion: cert-manager.io/v1
     kind: Issuer
     metadata:
       name: account-operator-selfsigned-issuer
     spec:
       selfSigned: {}
-  8: |
+  7: |
     apiVersion: cert-manager.io/v1
     kind: Certificate
     metadata:
@@ -444,7 +417,7 @@ operator match the snapshot:
         kind: Issuer
         name: account-operator-selfsigned-issuer
       secretName: account-operator-webhook-server-cert
-  9: |
+  8: |
     apiVersion: v1
     kind: Service
     metadata:
@@ -860,40 +833,13 @@ operator match the snapshot (with kubeconfigSecret):
     metadata:
       name: account-operator
   6: |
-    apiVersion: admissionregistration.k8s.io/v1
-    kind: MutatingWebhookConfiguration
-    metadata:
-      annotations:
-        cert-manager.io/inject-ca-from: NAMESPACE/account-operator-serving-cert
-      name: account-operator-mutating-webhook-configuration
-    webhooks:
-      - admissionReviewVersions:
-          - v1
-        clientConfig:
-          service:
-            name: account-operator-webhook
-            namespace: NAMESPACE
-            path: /mutate-core-openmfp-io-v1alpha1-account
-        failurePolicy: Fail
-        name: maccount.kb.io
-        rules:
-          - apiGroups:
-              - core.openmfp.io
-            apiVersions:
-              - v1alpha1
-            operations:
-              - CREATE
-            resources:
-              - accounts
-        sideEffects: None
-  7: |
     apiVersion: cert-manager.io/v1
     kind: Issuer
     metadata:
       name: account-operator-selfsigned-issuer
     spec:
       selfSigned: {}
-  8: |
+  7: |
     apiVersion: cert-manager.io/v1
     kind: Certificate
     metadata:
@@ -906,7 +852,7 @@ operator match the snapshot (with kubeconfigSecret):
         kind: Issuer
         name: account-operator-selfsigned-issuer
       secretName: account-operator-webhook-server-cert
-  9: |
+  8: |
     apiVersion: v1
     kind: Service
     metadata:
@@ -1315,40 +1261,13 @@ operator match the snapshot with webhook enabled:
     metadata:
       name: account-operator
   6: |
-    apiVersion: admissionregistration.k8s.io/v1
-    kind: MutatingWebhookConfiguration
-    metadata:
-      annotations:
-        cert-manager.io/inject-ca-from: NAMESPACE/account-operator-serving-cert
-      name: account-operator-mutating-webhook-configuration
-    webhooks:
-      - admissionReviewVersions:
-          - v1
-        clientConfig:
-          service:
-            name: account-operator-webhook
-            namespace: NAMESPACE
-            path: /mutate-core-openmfp-io-v1alpha1-account
-        failurePolicy: Fail
-        name: maccount.kb.io
-        rules:
-          - apiGroups:
-              - core.openmfp.io
-            apiVersions:
-              - v1alpha1
-            operations:
-              - CREATE
-            resources:
-              - accounts
-        sideEffects: None
-  7: |
     apiVersion: cert-manager.io/v1
     kind: Issuer
     metadata:
       name: account-operator-selfsigned-issuer
     spec:
       selfSigned: {}
-  8: |
+  7: |
     apiVersion: cert-manager.io/v1
     kind: Certificate
     metadata:
@@ -1361,7 +1280,7 @@ operator match the snapshot with webhook enabled:
         kind: Issuer
         name: account-operator-selfsigned-issuer
       secretName: account-operator-webhook-server-cert
-  9: |
+  8: |
     apiVersion: v1
     kind: Service
     metadata:

diff --git a/charts/account-operator/values.yaml b/charts/account-operator/values.yaml
@@ -11,6 +11,9 @@ crds:
 webhooks:
   # -- Enable webhooks
   enabled: true
+
+  # -- Register webhooks, flag to toggle if webhooks should be registered on the runtime cluster
+  register: false
   # -- The directory for webhook certificates
   certDir: /certs