Merge pull request #43 from finleap-connect/fix/webhook-config-v1

Fix webhook config for crd
finleap-connect · Jun 22, 2022 · fda1979 · fda1979
2 parents 0b9e0cc + 0a621b8
commit fda1979
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/charts/vault-operator/templates/crds.yaml b/charts/vault-operator/templates/crds.yaml
@@ -11,12 +11,13 @@ metadata:
 spec:
   conversion:
     strategy: Webhook
-    webhookClientConfig:
-      caBundle: Cg==
-      service:
-        name: '{{ include "vault-operator.fullname" . }}-webhook'
-        namespace: '{{ .Release.Namespace }}'
-        path: /convert
+    webhook:
+      clientConfig:
+        caBundle: Cg==
+        service:
+          name: '{{ include "vault-operator.fullname" . }}-webhook'
+          namespace: '{{ .Release.Namespace }}'
+          path: /convert
   group: vault.finleap.cloud
   names:
     kind: VaultSecret

diff --git a/config/crd-templates/patches/crd_patch.yaml b/config/crd-templates/patches/crd_patch.yaml
@@ -6,8 +6,9 @@ metadata:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/vault-operator-cert'
 spec:
   conversion:
-    webhookClientConfig:
-      service:
-        name: '{{ include "vault-operator.fullname" . }}-webhook'
+    webhook:
+      clientConfig:
+        service:
+          name: '{{ include "vault-operator.fullname" . }}-webhook'
   preserveUnknownFields: false
 
diff --git a/config/crd/kustomizeconfig.yaml b/config/crd/kustomizeconfig.yaml
@@ -5,12 +5,12 @@ nameReference:
   fieldSpecs:
   - kind: CustomResourceDefinition
     group: apiextensions.k8s.io
-    path: spec/conversion/webhookClientConfig/service/name
+    path: spec/conversion/webhook/clientConfig/service/name
 
 namespace:
 - kind: CustomResourceDefinition
   group: apiextensions.k8s.io
-  path: spec/conversion/webhookClientConfig/service/namespace
+  path: spec/conversion/webhook/clientConfig/service/namespace
   create: false
 
 varReference:

diff --git a/config/crd/patches/webhook_in_vaultsecrets.yaml b/config/crd/patches/webhook_in_vaultsecrets.yaml
@@ -7,11 +7,12 @@ metadata:
 spec:
   conversion:
     strategy: Webhook
-    webhookClientConfig:
-      # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
-      # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
-      caBundle: Cg==
-      service:
-        namespace: system
-        name: '{{ include "vault-operator.fullname" . }}-webhook'
-        path: /convert
+    webhook:
+      clientConfig:
+        # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
+        # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
+        caBundle: Cg==
+        service:
+          namespace: system
+          name: '{{ include "vault-operator.fullname" . }}-webhook'
+          path: /convert