Merge pull request #10969 from sbueringer/pr-remove-ca-inject

🌱 Remove duplicate ca injection via kustomize
kubernetes-sigs · Aug 1, 2024 · 2bdd4b7 · 2bdd4b7
2 parents ab7bac8 + 7642192
commit 2bdd4b7
Show file tree

Hide file tree

Showing 28 changed files with 0 additions and 225 deletions.
diff --git a/bootstrap/kubeadm/config/crd/kustomization.yaml b/bootstrap/kubeadm/config/crd/kustomization.yaml
@@ -18,12 +18,6 @@ patches:
 - path: patches/webhook_in_kubeadmconfigtemplates.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_kubeadmconfigs.yaml
-- path: patches/cainjection_in_kubeadmconfigtemplates.yaml
-# +kubebuilder:scaffold:crdkustomizecainjectionpatch
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml
diff --git a/bootstrap/kubeadm/config/crd/patches/cainjection_in_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/patches/cainjection_in_kubeadmconfigs.yaml
diff --git a/bootstrap/kubeadm/config/crd/patches/cainjection_in_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/patches/cainjection_in_kubeadmconfigtemplates.yaml
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -30,19 +30,6 @@ patches:
 - path: patches/webhook_in_clusterresourcesetbindings.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_clusterclasses.yaml
-- path: patches/cainjection_in_clusters.yaml
-- path: patches/cainjection_in_machinepools.yaml
-- path: patches/cainjection_in_machines.yaml
-- path: patches/cainjection_in_machinesets.yaml
-- path: patches/cainjection_in_machinedeployments.yaml
-- path: patches/cainjection_in_machinehealthchecks.yaml
-- path: patches/cainjection_in_clusterresourcesets.yaml
-- path: patches/cainjection_in_clusterresourcesetbindings.yaml
-# +kubebuilder:scaffold:crdkustomizecainjectionpatch
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml
diff --git a/config/crd/patches/cainjection_in_clusterclasses.yaml b/config/crd/patches/cainjection_in_clusterclasses.yaml
diff --git a/config/crd/patches/cainjection_in_clusterresourcesetbindings.yaml b/config/crd/patches/cainjection_in_clusterresourcesetbindings.yaml
diff --git a/config/crd/patches/cainjection_in_clusterresourcesets.yaml b/config/crd/patches/cainjection_in_clusterresourcesets.yaml
diff --git a/config/crd/patches/cainjection_in_clusters.yaml b/config/crd/patches/cainjection_in_clusters.yaml
diff --git a/config/crd/patches/cainjection_in_machinedeployments.yaml b/config/crd/patches/cainjection_in_machinedeployments.yaml
diff --git a/config/crd/patches/cainjection_in_machinehealthchecks.yaml b/config/crd/patches/cainjection_in_machinehealthchecks.yaml
diff --git a/config/crd/patches/cainjection_in_machinepools.yaml b/config/crd/patches/cainjection_in_machinepools.yaml
diff --git a/config/crd/patches/cainjection_in_machines.yaml b/config/crd/patches/cainjection_in_machines.yaml
diff --git a/config/crd/patches/cainjection_in_machinesets.yaml b/config/crd/patches/cainjection_in_machinesets.yaml
diff --git a/controlplane/kubeadm/config/crd/kustomization.yaml b/controlplane/kubeadm/config/crd/kustomization.yaml
@@ -18,12 +18,6 @@ patches:
 - path: patches/webhook_in_kubeadmcontrolplanetemplates.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_kubeadmcontrolplanes.yaml
-- path: patches/cainjection_in_kubeadmcontrolplanetemplates.yaml
-# +kubebuilder:scaffold:crdkustomizecainjectionpatch
-
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
 - kustomizeconfig.yaml
diff --git a/controlplane/kubeadm/config/crd/patches/cainjection_in_kubeadmcontrolplanes.yaml b/controlplane/kubeadm/config/crd/patches/cainjection_in_kubeadmcontrolplanes.yaml
diff --git a/controlplane/kubeadm/config/crd/patches/cainjection_in_kubeadmcontrolplanetemplates.yaml b/controlplane/kubeadm/config/crd/patches/cainjection_in_kubeadmcontrolplanetemplates.yaml
diff --git a/test/infrastructure/docker/config/crd/kustomization.yaml b/test/infrastructure/docker/config/crd/kustomization.yaml
@@ -27,15 +27,6 @@ patches:
 - path: patches/webhook_in_dockerclustertemplates.yaml
 - path: patches/webhook_in_dockermachinepooltemplates.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_dockermachinepools.yaml
-- path: patches/cainjection_in_dockermachines.yaml
-- path: patches/cainjection_in_dockermachinetemplates.yaml
-- path: patches/cainjection_in_dockerclusters.yaml
-- path: patches/cainjection_in_dockerclustertemplates.yaml
-- path: patches/cainjection_in_dockermachinepooltemplates.yaml
-# +kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:

diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockerclusters.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockerclusters.yaml
diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockerclustertemplates.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockerclustertemplates.yaml
diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepools.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepools.yaml
diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepooltemplates.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepooltemplates.yaml
diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachines.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachines.yaml
diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinetemplates.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinetemplates.yaml
diff --git a/test/infrastructure/inmemory/config/crd/kustomization.yaml b/test/infrastructure/inmemory/config/crd/kustomization.yaml
@@ -23,13 +23,6 @@ patches:
 - path: patches/webhook_in_inmemorymachines.yaml
 - path: patches/webhook_in_inmemorymachinetemplates.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_inmemoryclusters.yaml
-- path: patches/cainjection_in_inmemoryclustertemplates.yaml
-- path: patches/cainjection_in_inmemorymachines.yaml
-- path: patches/cainjection_in_inmemorymachinetemplates.yaml
-# +kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:

diff --git a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemoryclusters.yaml b/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemoryclusters.yaml
diff --git a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemoryclustertemplates.yaml b/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemoryclustertemplates.yaml
diff --git a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachines.yaml b/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachines.yaml
diff --git a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachinetemplates.yaml b/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachinetemplates.yaml