From 764219248928be0cbeb8d4abaabf06f334a80dba Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Wed, 31 Jul 2024 17:05:05 +0200 Subject: [PATCH] Remove duplicate ca injection via kustomize MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- bootstrap/kubeadm/config/crd/kustomization.yaml | 6 ------ .../crd/patches/cainjection_in_kubeadmconfigs.yaml | 8 -------- .../cainjection_in_kubeadmconfigtemplates.yaml | 8 -------- config/crd/kustomization.yaml | 13 ------------- .../crd/patches/cainjection_in_clusterclasses.yaml | 8 -------- .../cainjection_in_clusterresourcesetbindings.yaml | 8 -------- .../patches/cainjection_in_clusterresourcesets.yaml | 8 -------- config/crd/patches/cainjection_in_clusters.yaml | 8 -------- .../patches/cainjection_in_machinedeployments.yaml | 8 -------- .../patches/cainjection_in_machinehealthchecks.yaml | 8 -------- config/crd/patches/cainjection_in_machinepools.yaml | 8 -------- config/crd/patches/cainjection_in_machines.yaml | 8 -------- config/crd/patches/cainjection_in_machinesets.yaml | 8 -------- controlplane/kubeadm/config/crd/kustomization.yaml | 6 ------ .../cainjection_in_kubeadmcontrolplanes.yaml | 8 -------- ...cainjection_in_kubeadmcontrolplanetemplates.yaml | 8 -------- .../docker/config/crd/kustomization.yaml | 9 --------- .../crd/patches/cainjection_in_dockerclusters.yaml | 8 -------- .../cainjection_in_dockerclustertemplates.yaml | 8 -------- .../patches/cainjection_in_dockermachinepools.yaml | 8 -------- .../cainjection_in_dockermachinepooltemplates.yaml | 8 -------- .../crd/patches/cainjection_in_dockermachines.yaml | 8 -------- .../cainjection_in_dockermachinetemplates.yaml | 8 -------- .../inmemory/config/crd/kustomization.yaml | 7 ------- .../patches/cainjection_in_inmemoryclusters.yaml | 8 -------- .../cainjection_in_inmemoryclustertemplates.yaml | 8 -------- .../patches/cainjection_in_inmemorymachines.yaml | 8 -------- .../cainjection_in_inmemorymachinetemplates.yaml | 8 -------- 28 files changed, 225 deletions(-) delete mode 100644 bootstrap/kubeadm/config/crd/patches/cainjection_in_kubeadmconfigs.yaml delete mode 100644 bootstrap/kubeadm/config/crd/patches/cainjection_in_kubeadmconfigtemplates.yaml delete mode 100644 config/crd/patches/cainjection_in_clusterclasses.yaml delete mode 100644 config/crd/patches/cainjection_in_clusterresourcesetbindings.yaml delete mode 100644 config/crd/patches/cainjection_in_clusterresourcesets.yaml delete mode 100644 config/crd/patches/cainjection_in_clusters.yaml delete mode 100644 config/crd/patches/cainjection_in_machinedeployments.yaml delete mode 100644 config/crd/patches/cainjection_in_machinehealthchecks.yaml delete mode 100644 config/crd/patches/cainjection_in_machinepools.yaml delete mode 100644 config/crd/patches/cainjection_in_machines.yaml delete mode 100644 config/crd/patches/cainjection_in_machinesets.yaml delete mode 100644 controlplane/kubeadm/config/crd/patches/cainjection_in_kubeadmcontrolplanes.yaml delete mode 100644 controlplane/kubeadm/config/crd/patches/cainjection_in_kubeadmcontrolplanetemplates.yaml delete mode 100644 test/infrastructure/docker/config/crd/patches/cainjection_in_dockerclusters.yaml delete mode 100644 test/infrastructure/docker/config/crd/patches/cainjection_in_dockerclustertemplates.yaml delete mode 100644 test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepools.yaml delete mode 100644 test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepooltemplates.yaml delete mode 100644 test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachines.yaml delete mode 100644 test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinetemplates.yaml delete mode 100644 test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemoryclusters.yaml delete mode 100644 test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemoryclustertemplates.yaml delete mode 100644 test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachines.yaml delete mode 100644 test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachinetemplates.yaml diff --git a/bootstrap/kubeadm/config/crd/kustomization.yaml b/bootstrap/kubeadm/config/crd/kustomization.yaml index 05d0c30aa081..131412f826b0 100644 --- 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 deleted file mode 100644 index fb0a62fe2008..000000000000 --- a/bootstrap/kubeadm/config/crd/patches/cainjection_in_kubeadmconfigs.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: kubeadmconfigs.bootstrap.cluster.x-k8s.io diff --git a/bootstrap/kubeadm/config/crd/patches/cainjection_in_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/patches/cainjection_in_kubeadmconfigtemplates.yaml deleted file mode 100644 index a8bc5dcf1d26..000000000000 --- a/bootstrap/kubeadm/config/crd/patches/cainjection_in_kubeadmconfigtemplates.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: kubeadmconfigtemplates.bootstrap.cluster.x-k8s.io diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 2893a4e8b95c..7ec097eb9e72 100644 --- 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 deleted file mode 100644 index 59f29099f38e..000000000000 --- a/config/crd/patches/cainjection_in_clusterclasses.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: clusterclasses.cluster.x-k8s.io diff --git a/config/crd/patches/cainjection_in_clusterresourcesetbindings.yaml b/config/crd/patches/cainjection_in_clusterresourcesetbindings.yaml deleted file mode 100644 index a6df0122dc08..000000000000 --- a/config/crd/patches/cainjection_in_clusterresourcesetbindings.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: clusterresourcesetbindings.addons.cluster.x-k8s.io diff --git a/config/crd/patches/cainjection_in_clusterresourcesets.yaml b/config/crd/patches/cainjection_in_clusterresourcesets.yaml deleted file mode 100644 index 4d193c0c4f03..000000000000 --- a/config/crd/patches/cainjection_in_clusterresourcesets.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: clusterresourcesets.addons.cluster.x-k8s.io diff --git a/config/crd/patches/cainjection_in_clusters.yaml b/config/crd/patches/cainjection_in_clusters.yaml deleted file mode 100644 index 871b0adf5d70..000000000000 --- a/config/crd/patches/cainjection_in_clusters.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: clusters.cluster.x-k8s.io diff --git a/config/crd/patches/cainjection_in_machinedeployments.yaml b/config/crd/patches/cainjection_in_machinedeployments.yaml deleted file mode 100644 index 6fe5699f8033..000000000000 --- a/config/crd/patches/cainjection_in_machinedeployments.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: machinedeployments.cluster.x-k8s.io diff --git a/config/crd/patches/cainjection_in_machinehealthchecks.yaml b/config/crd/patches/cainjection_in_machinehealthchecks.yaml deleted file mode 100644 index 6b45c097adc9..000000000000 --- a/config/crd/patches/cainjection_in_machinehealthchecks.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: machinehealthchecks.cluster.x-k8s.io diff --git a/config/crd/patches/cainjection_in_machinepools.yaml b/config/crd/patches/cainjection_in_machinepools.yaml deleted file mode 100644 index aa288820ae21..000000000000 --- a/config/crd/patches/cainjection_in_machinepools.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: machinepools.cluster.x-k8s.io diff --git a/config/crd/patches/cainjection_in_machines.yaml b/config/crd/patches/cainjection_in_machines.yaml deleted file mode 100644 index 84d59e66adab..000000000000 --- a/config/crd/patches/cainjection_in_machines.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: machines.cluster.x-k8s.io diff --git a/config/crd/patches/cainjection_in_machinesets.yaml b/config/crd/patches/cainjection_in_machinesets.yaml deleted file mode 100644 index efb0eb98e8ef..000000000000 --- a/config/crd/patches/cainjection_in_machinesets.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: machinesets.cluster.x-k8s.io diff --git a/controlplane/kubeadm/config/crd/kustomization.yaml b/controlplane/kubeadm/config/crd/kustomization.yaml index 266cb6e266cb..8255b20e4c7f 100644 --- 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 deleted file mode 100644 index 8592ccf0e104..000000000000 --- a/controlplane/kubeadm/config/crd/patches/cainjection_in_kubeadmcontrolplanes.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: kubeadmcontrolplanes.controlplane.cluster.x-k8s.io diff --git a/controlplane/kubeadm/config/crd/patches/cainjection_in_kubeadmcontrolplanetemplates.yaml b/controlplane/kubeadm/config/crd/patches/cainjection_in_kubeadmcontrolplanetemplates.yaml deleted file mode 100644 index 25c104a96810..000000000000 --- a/controlplane/kubeadm/config/crd/patches/cainjection_in_kubeadmcontrolplanetemplates.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: kubeadmcontrolplanetemplates.controlplane.cluster.x-k8s.io diff --git a/test/infrastructure/docker/config/crd/kustomization.yaml b/test/infrastructure/docker/config/crd/kustomization.yaml index 4c2e4a7c06c9..827d5e8b353d 100644 --- 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 deleted file mode 100644 index 51bc8213a62a..000000000000 --- a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockerclusters.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: dockerclusters.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockerclustertemplates.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockerclustertemplates.yaml deleted file mode 100644 index 0f1873197dd3..000000000000 --- a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockerclustertemplates.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: dockerclustertemplates.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepools.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepools.yaml deleted file mode 100644 index 14afbabe0469..000000000000 --- a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepools.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: dockermachinepools.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepooltemplates.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepooltemplates.yaml deleted file mode 100644 index a602a21f5a5f..000000000000 --- a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinepooltemplates.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: dockermachinepooltemplates.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachines.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachines.yaml deleted file mode 100644 index 60b0c932d166..000000000000 --- a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachines.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: dockermachines.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinetemplates.yaml b/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinetemplates.yaml deleted file mode 100644 index ae38017ad159..000000000000 --- a/test/infrastructure/docker/config/crd/patches/cainjection_in_dockermachinetemplates.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: dockermachinetemplates.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/inmemory/config/crd/kustomization.yaml b/test/infrastructure/inmemory/config/crd/kustomization.yaml index 9453dc67964b..245839c946c3 100644 --- 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 deleted file mode 100644 index aefac5f30549..000000000000 --- a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemoryclusters.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: inmemoryclusters.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemoryclustertemplates.yaml b/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemoryclustertemplates.yaml deleted file mode 100644 index b2d147f87fe5..000000000000 --- a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemoryclustertemplates.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: inmemoryclustertemplates.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachines.yaml b/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachines.yaml deleted file mode 100644 index 58105eac88d8..000000000000 --- a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachines.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: inmemorymachines.infrastructure.cluster.x-k8s.io diff --git a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachinetemplates.yaml b/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachinetemplates.yaml deleted file mode 100644 index 4622ae96b141..000000000000 --- a/test/infrastructure/inmemory/config/crd/patches/cainjection_in_inmemorymachinetemplates.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# The following patch adds a directive for certmanager to inject CA into the CRD -# CRD conversion requires k8s 1.13 or later. -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - cert-manager.io/inject-ca-from: CERTIFICATE_NAMESPACE/CERTIFICATE_NAME - name: inmemorymachinetemplates.infrastructure.cluster.x-k8s.io