Merge pull request openshift#264 from shiftstack/webhook-kustomize

openshift-ci[bot] · web-flow · commit 9a1e2cddbcb1 · 2023-10-13T16:43:46.000Z
UPSTREAM 1686: Move webhook CA injection into webhook resource
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -19,19 +19,6 @@ patches:
 - path: manager_pull_policy.yaml
   # Enable webhook.
 - path: manager_webhook_patch.yaml
-  # Inject certificate in the webhook definition.
-- target:
-    group: admissionregistration.k8s.io
-    version: v1
-    kind: MutatingWebhookConfiguration
-    name: mutating-webhook-configuration
-  path: cainjection_patch.yaml
-- target:
-    group: admissionregistration.k8s.io
-    version: v1
-    kind: ValidatingWebhookConfiguration
-    name: validating-webhook-configuration
-  path: cainjection_patch.yaml
 
 vars:
   - name: CERTIFICATE_NAMESPACE # namespace of the certificate CR
diff --git a/config/webhook/cainjection_patch.yaml b/config/webhook/cainjection_patch.yaml
diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml
@@ -4,3 +4,11 @@ resources:
 
 configurations:
 - kustomizeconfig.yaml
+
+patches:
+# Inject certificate in the webhook definition.
+- target:
+    group: admissionregistration.k8s.io
+    version: v1
+    name: mutating-webhook-configuration|validating-webhook-configuration
+  path: cainjection_patch.yaml
