From df8b1073f3623580b9b959d6c0d34f59ac43bf3f Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Wed, 31 Jul 2024 19:55:34 +0200 Subject: [PATCH] Drop caBundle from CRDs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- .../kubeadm/config/crd/patches/webhook_in_kubeadmconfigs.yaml | 3 --- .../config/crd/patches/webhook_in_kubeadmconfigtemplates.yaml | 3 --- config/crd/patches/webhook_in_clusterclasses.yaml | 3 --- config/crd/patches/webhook_in_clusterresourcesetbindings.yaml | 3 --- config/crd/patches/webhook_in_clusterresourcesets.yaml | 3 --- config/crd/patches/webhook_in_clusters.yaml | 3 --- config/crd/patches/webhook_in_machinedeployments.yaml | 3 --- config/crd/patches/webhook_in_machinehealthchecks.yaml | 3 --- config/crd/patches/webhook_in_machinepools.yaml | 3 --- config/crd/patches/webhook_in_machines.yaml | 3 --- config/crd/patches/webhook_in_machinesets.yaml | 3 --- .../config/crd/patches/webhook_in_kubeadmcontrolplanes.yaml | 3 --- .../crd/patches/webhook_in_kubeadmcontrolplanetemplates.yaml | 3 --- .../docker/config/crd/patches/webhook_in_dockerclusters.yaml | 3 --- .../config/crd/patches/webhook_in_dockerclustertemplates.yaml | 3 --- .../config/crd/patches/webhook_in_dockermachinepools.yaml | 3 --- .../crd/patches/webhook_in_dockermachinepooltemplates.yaml | 3 --- .../docker/config/crd/patches/webhook_in_dockermachines.yaml | 3 --- .../config/crd/patches/webhook_in_dockermachinetemplates.yaml | 3 --- .../config/crd/patches/webhook_in_inmemoryclusters.yaml | 3 --- .../crd/patches/webhook_in_inmemoryclustertemplates.yaml | 3 --- .../config/crd/patches/webhook_in_inmemorymachines.yaml | 3 --- .../crd/patches/webhook_in_inmemorymachinetemplates.yaml | 3 --- 23 files changed, 69 deletions(-) diff --git a/bootstrap/kubeadm/config/crd/patches/webhook_in_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/patches/webhook_in_kubeadmconfigs.yaml index 11214bd21e27..55cc816bc7a3 100644 --- a/bootstrap/kubeadm/config/crd/patches/webhook_in_kubeadmconfigs.yaml +++ b/bootstrap/kubeadm/config/crd/patches/webhook_in_kubeadmconfigs.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/bootstrap/kubeadm/config/crd/patches/webhook_in_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/patches/webhook_in_kubeadmconfigtemplates.yaml index 0e9876995367..10bdd7e3630e 100644 --- a/bootstrap/kubeadm/config/crd/patches/webhook_in_kubeadmconfigtemplates.yaml +++ b/bootstrap/kubeadm/config/crd/patches/webhook_in_kubeadmconfigtemplates.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/config/crd/patches/webhook_in_clusterclasses.yaml b/config/crd/patches/webhook_in_clusterclasses.yaml index 0cb0f1f05c3e..3beaa5a7fcaa 100644 --- a/config/crd/patches/webhook_in_clusterclasses.yaml +++ b/config/crd/patches/webhook_in_clusterclasses.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/config/crd/patches/webhook_in_clusterresourcesetbindings.yaml b/config/crd/patches/webhook_in_clusterresourcesetbindings.yaml index c91501788ade..3e2c20ff53e2 100644 --- a/config/crd/patches/webhook_in_clusterresourcesetbindings.yaml +++ b/config/crd/patches/webhook_in_clusterresourcesetbindings.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/config/crd/patches/webhook_in_clusterresourcesets.yaml b/config/crd/patches/webhook_in_clusterresourcesets.yaml index ef455ca6f813..24b238d32e70 100644 --- a/config/crd/patches/webhook_in_clusterresourcesets.yaml +++ b/config/crd/patches/webhook_in_clusterresourcesets.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/config/crd/patches/webhook_in_clusters.yaml b/config/crd/patches/webhook_in_clusters.yaml index bd8296357d26..a61571d4976a 100644 --- a/config/crd/patches/webhook_in_clusters.yaml +++ b/config/crd/patches/webhook_in_clusters.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/config/crd/patches/webhook_in_machinedeployments.yaml b/config/crd/patches/webhook_in_machinedeployments.yaml index b25c181b0235..eacdc74eb62c 100644 --- a/config/crd/patches/webhook_in_machinedeployments.yaml +++ b/config/crd/patches/webhook_in_machinedeployments.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/config/crd/patches/webhook_in_machinehealthchecks.yaml b/config/crd/patches/webhook_in_machinehealthchecks.yaml index 06ca3dfcda9c..031030f35a19 100644 --- a/config/crd/patches/webhook_in_machinehealthchecks.yaml +++ b/config/crd/patches/webhook_in_machinehealthchecks.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/config/crd/patches/webhook_in_machinepools.yaml b/config/crd/patches/webhook_in_machinepools.yaml index 44ddf9ddc36a..a55eb3b20a1e 100644 --- a/config/crd/patches/webhook_in_machinepools.yaml +++ b/config/crd/patches/webhook_in_machinepools.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/config/crd/patches/webhook_in_machines.yaml b/config/crd/patches/webhook_in_machines.yaml index 2ef7c78a2f4c..df3b7d5da333 100644 --- a/config/crd/patches/webhook_in_machines.yaml +++ b/config/crd/patches/webhook_in_machines.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/config/crd/patches/webhook_in_machinesets.yaml b/config/crd/patches/webhook_in_machinesets.yaml index f1de2f2b2bd9..e0e4458e820d 100644 --- a/config/crd/patches/webhook_in_machinesets.yaml +++ b/config/crd/patches/webhook_in_machinesets.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/controlplane/kubeadm/config/crd/patches/webhook_in_kubeadmcontrolplanes.yaml b/controlplane/kubeadm/config/crd/patches/webhook_in_kubeadmcontrolplanes.yaml index 0b71de009269..07abb7ec1380 100644 --- a/controlplane/kubeadm/config/crd/patches/webhook_in_kubeadmcontrolplanes.yaml +++ b/controlplane/kubeadm/config/crd/patches/webhook_in_kubeadmcontrolplanes.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/controlplane/kubeadm/config/crd/patches/webhook_in_kubeadmcontrolplanetemplates.yaml b/controlplane/kubeadm/config/crd/patches/webhook_in_kubeadmcontrolplanetemplates.yaml index d5272e23afac..a06619a2d4ae 100644 --- a/controlplane/kubeadm/config/crd/patches/webhook_in_kubeadmcontrolplanetemplates.yaml +++ b/controlplane/kubeadm/config/crd/patches/webhook_in_kubeadmcontrolplanetemplates.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/test/infrastructure/docker/config/crd/patches/webhook_in_dockerclusters.yaml b/test/infrastructure/docker/config/crd/patches/webhook_in_dockerclusters.yaml index 2dfca085ab83..51fbb90379a2 100644 --- a/test/infrastructure/docker/config/crd/patches/webhook_in_dockerclusters.yaml +++ b/test/infrastructure/docker/config/crd/patches/webhook_in_dockerclusters.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/test/infrastructure/docker/config/crd/patches/webhook_in_dockerclustertemplates.yaml b/test/infrastructure/docker/config/crd/patches/webhook_in_dockerclustertemplates.yaml index 7c11cf888bd7..84324ef0f052 100644 --- a/test/infrastructure/docker/config/crd/patches/webhook_in_dockerclustertemplates.yaml +++ b/test/infrastructure/docker/config/crd/patches/webhook_in_dockerclustertemplates.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinepools.yaml b/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinepools.yaml index 67ddbacf1cb4..ffb24f46633f 100644 --- a/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinepools.yaml +++ b/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinepools.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinepooltemplates.yaml b/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinepooltemplates.yaml index 7bc2cde83d79..bc34bb377da2 100644 --- a/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinepooltemplates.yaml +++ b/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinepooltemplates.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachines.yaml b/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachines.yaml index a9c56366fa6e..f83832a2012e 100644 --- a/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachines.yaml +++ b/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachines.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinetemplates.yaml b/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinetemplates.yaml index 6bad66d3bf66..c60eebc92960 100644 --- a/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinetemplates.yaml +++ b/test/infrastructure/docker/config/crd/patches/webhook_in_dockermachinetemplates.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemoryclusters.yaml b/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemoryclusters.yaml index ab49b2f9b3f4..9f599c6575a2 100644 --- a/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemoryclusters.yaml +++ b/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemoryclusters.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemoryclustertemplates.yaml b/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemoryclustertemplates.yaml index 6457b7a5d1d3..e4334d160181 100644 --- a/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemoryclustertemplates.yaml +++ b/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemoryclustertemplates.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemorymachines.yaml b/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemorymachines.yaml index 3a6c559f2998..1101cd45e05c 100644 --- a/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemorymachines.yaml +++ b/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemorymachines.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service diff --git a/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemorymachinetemplates.yaml b/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemorymachinetemplates.yaml index c008aafdb7fa..b0c57b7c09af 100644 --- a/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemorymachinetemplates.yaml +++ b/test/infrastructure/inmemory/config/crd/patches/webhook_in_inmemorymachinetemplates.yaml @@ -10,9 +10,6 @@ spec: webhook: conversionReviewVersions: ["v1", "v1beta1"] clientConfig: - # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank, - # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager) - caBundle: Cg== service: namespace: system name: webhook-service