From 28fb63d82074b36f3bdbc19f40f795f2cc9f9d29 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Thu, 1 Aug 2024 10:14:51 +0200 Subject: [PATCH] Drop caBundle from CRDs to support Kubernetes 1.31 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Stefan Büringer buringerst@vmware.com --- config/default/crd/patches/webhook_in_vsphereclusters.yaml | 3 --- .../crd/patches/webhook_in_vsphereclustertemplates.yaml | 3 --- .../crd/patches/webhook_in_vspheredeploymentzones.yaml | 3 --- .../crd/patches/webhook_in_vspherefailuredomains.yaml | 3 --- config/default/crd/patches/webhook_in_vspheremachines.yaml | 5 +---- .../crd/patches/webhook_in_vspheremachinetemplates.yaml | 5 +---- config/default/crd/patches/webhook_in_vspherevms.yaml | 3 --- 7 files changed, 2 insertions(+), 23 deletions(-) diff --git a/config/default/crd/patches/webhook_in_vsphereclusters.yaml b/config/default/crd/patches/webhook_in_vsphereclusters.yaml index beef5a4ed3..2be81aa726 100644 --- a/config/default/crd/patches/webhook_in_vsphereclusters.yaml +++ b/config/default/crd/patches/webhook_in_vsphereclusters.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/default/crd/patches/webhook_in_vsphereclustertemplates.yaml b/config/default/crd/patches/webhook_in_vsphereclustertemplates.yaml index 2295b77538..469f654dfc 100644 --- a/config/default/crd/patches/webhook_in_vsphereclustertemplates.yaml +++ b/config/default/crd/patches/webhook_in_vsphereclustertemplates.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/default/crd/patches/webhook_in_vspheredeploymentzones.yaml b/config/default/crd/patches/webhook_in_vspheredeploymentzones.yaml index 815556db68..033c6e96fc 100644 --- a/config/default/crd/patches/webhook_in_vspheredeploymentzones.yaml +++ b/config/default/crd/patches/webhook_in_vspheredeploymentzones.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/default/crd/patches/webhook_in_vspherefailuredomains.yaml b/config/default/crd/patches/webhook_in_vspherefailuredomains.yaml index d981434edd..015fbf91c2 100644 --- a/config/default/crd/patches/webhook_in_vspherefailuredomains.yaml +++ b/config/default/crd/patches/webhook_in_vspherefailuredomains.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/default/crd/patches/webhook_in_vspheremachines.yaml b/config/default/crd/patches/webhook_in_vspheremachines.yaml index ad5190e9d6..3d89f0e675 100644 --- a/config/default/crd/patches/webhook_in_vspheremachines.yaml +++ b/config/default/crd/patches/webhook_in_vspheremachines.yaml @@ -10,10 +10,7 @@ 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 - path: /convert \ No newline at end of file + path: /convert diff --git a/config/default/crd/patches/webhook_in_vspheremachinetemplates.yaml b/config/default/crd/patches/webhook_in_vspheremachinetemplates.yaml index 5e0c7e056d..199c28d6ee 100644 --- a/config/default/crd/patches/webhook_in_vspheremachinetemplates.yaml +++ b/config/default/crd/patches/webhook_in_vspheremachinetemplates.yaml @@ -10,10 +10,7 @@ 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 - path: /convert \ No newline at end of file + path: /convert diff --git a/config/default/crd/patches/webhook_in_vspherevms.yaml b/config/default/crd/patches/webhook_in_vspherevms.yaml index 6d09aaf6ad..9331d2612e 100644 --- a/config/default/crd/patches/webhook_in_vspherevms.yaml +++ b/config/default/crd/patches/webhook_in_vspherevms.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