Consolidate cert-manager kustomize pieces into the one component

Author: james-callahan

config/crd/patches/cainjection_in_ingressclassparams.yaml renamed to config/certmanager/cainjection_in_ingressclassparams_patch.yaml

@@ -1,6 +1,21 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
 configurations:
   - kustomizeconfig.yaml
 resources:
   - certificate.yaml
+patches:
+  # patches here are for enabling the CA injection for each CRD
+  - path: cainjection_in_targetgroupbindings_patch.yaml
+  - path: cainjection_in_ingressclassparams_patch.yaml
+  # This patch add annotation to admission webhook config and
+  # the variables $(CERTIFICATE_NAMESPACE) and $(CERTIFICATE_NAME) will be substituted by kustomize.
+  - target:
+      kind: (MutatingWebhookConfiguration|ValidatingWebhookConfiguration)
+    patch: |-
+      apiVersion: admissionregistration.k8s.io/v1
+      kind: dummy
+      metadata:
+        name: webhook
+        annotations:
+          cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)

config/crd/patches/cainjection_in_targetgroupbindings.yaml renamed to config/certmanager/cainjection_in_targetgroupbindings_patch.yaml

@@ -19,10 +19,3 @@ patches:
 #- path: patches/webhook_in_targetgroupbindings.yaml
 #- path: patches/webhook_in_ingressclassparams.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
-#- path: patches/cainjection_in_targetgroupbindings.yaml
-#- path: patches/cainjection_in_ingressclassparams.yaml
-# +kubebuilder:scaffold:crdkustomizecainjectionpatch
-

config/certmanager/kustomization.yaml

@@ -22,31 +22,18 @@ resources:
   # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
   # crd/kustomization.yaml
   - ../webhook
-  # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
+  # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
+  #- ../prometheus
+
+components:
+  # To disable cert-manager comment out the following line, the 'webhook' component is required
   - ../certmanager
-# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
-#- ../prometheus
 
 patches:
   # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
   # crd/kustomization.yaml
   - path: controller_webhook_patch.yaml
 
-  # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
-  # Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.
-  # 'CERTMANAGER' needs to be enabled to use ca injection
-  # This patch add annotation to admission webhook config and
-  # the variables $(CERTIFICATE_NAMESPACE) and $(CERTIFICATE_NAME) will be substituted by kustomize.
-  - target:
-      kind: (MutatingWebhookConfiguration|ValidatingWebhookConfiguration)
-    patch: |-
-      apiVersion: admissionregistration.k8s.io/v1
-      kind: dummy
-      metadata:
-        name: webhook
-        annotations:
-          cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-
 # the following config is for teaching kustomize how to do var substitution
 vars:
   # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.