Update uses of some deprecated kustomize features

Author: mdbooth

config/crd/kustomization.yaml

@@ -11,21 +11,21 @@ resources:
 - bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
-patchesStrategicMerge:
+patches:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
-- patches/webhook_in_openstackclusters.yaml
-- patches/webhook_in_openstackmachines.yaml
-- patches/webhook_in_openstackmachinetemplates.yaml
-- patches/webhook_in_openstackclustertemplates.yaml
+- path: patches/webhook_in_openstackclusters.yaml
+- path: patches/webhook_in_openstackmachines.yaml
+- path: patches/webhook_in_openstackmachinetemplates.yaml
+- path: patches/webhook_in_openstackclustertemplates.yaml
 # +kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
-- patches/cainjection_in_openstackclusters.yaml
-- patches/cainjection_in_openstackmachines.yaml
-- patches/cainjection_in_openstackmachinetemplates.yaml
-- patches/cainjection_in_openstackclustertemplates.yaml
+- path: patches/cainjection_in_openstackclusters.yaml
+- path: patches/cainjection_in_openstackmachines.yaml
+- path: patches/cainjection_in_openstackmachinetemplates.yaml
+- path: patches/cainjection_in_openstackclustertemplates.yaml
 # +kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

config/default/cainjection_patch.yaml

@@ -0,0 +1,3 @@
+- op: add
+  path: "/metadata/annotations/cert-manager.io~1inject-ca-from"
+  value: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)

config/default/kustomization.yaml

@@ -7,22 +7,31 @@ commonLabels:
 
 resources:
 - namespace.yaml
-
-bases:
 - ../crd
 - ../rbac
 - ../manager
 - ../webhook
 - ../certmanager
 
-patchesStrategicMerge:
+patches:
 # Provide customizable hook for make targets.
-- manager_image_patch.yaml
-- manager_pull_policy.yaml
+- path: manager_image_patch.yaml
+- path: manager_pull_policy.yaml
   # Enable webhook.
-- manager_webhook_patch.yaml
+- path: manager_webhook_patch.yaml
   # Inject certificate in the webhook definition.
-- webhookcainjection_patch.yaml
+- 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