Consolidate webhook kustomize pieces into the one component

Author: james-callahan

config/crd/kustomization.yaml

@@ -12,10 +12,3 @@ resources:
   - bases/elbv2.k8s.aws_targetgroupbindings.yaml
   - bases/elbv2.k8s.aws_ingressclassparams.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
-
-patches:
-# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
-# patches here are for enabling the conversion webhook for each CRD
-#- path: patches/webhook_in_targetgroupbindings.yaml
-#- path: patches/webhook_in_ingressclassparams.yaml
-# +kubebuilder:scaffold:crdkustomizewebhookpatch

config/default/kustomization.yaml

@@ -19,21 +19,15 @@ resources:
   - ../crd
   - ../rbac
   - ../controller
-  # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
-  # crd/kustomization.yaml
-  - ../webhook
   # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'.
   #- ../prometheus
 
 components:
+  # To disable the conversion webhook, comment out this component
+  - ../webhook
   # To disable cert-manager comment out the following line, the 'webhook' component is required
   - ../certmanager
 
-patches:
-  # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
-  # crd/kustomization.yaml
-  - path: controller_webhook_patch.yaml
-
 # the following config is for teaching kustomize how to do var substitution
 vars:
   # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix.

config/default/controller_webhook_patch.yaml renamed to config/webhook/controller_webhook_patch.yaml

@@ -1,5 +1,5 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
 
 configurations:
   - kustomizeconfig.yaml
@@ -12,3 +12,7 @@ patches:
   - path: pod_mutator_patch.yaml
   - path: service_mutator_patch.yaml
   - path: ingressclassparams_validator_patch.yaml
+  - path: controller_webhook_patch.yaml
+  # patches here are for enabling the conversion webhook for each CRD
+  - path: targetgroupbindings_patch.yaml
+  - path: ingressclassparams_patch.yaml