Merge pull request #3133 from k8s-infra-cherrypick-robot/cherry-pick-…

…3131-to-release-1.10 [release-1.10] 🐛 Drop caBundle from CRDs to support Kubernetes 1.31
kubernetes-sigs · Aug 1, 2024 · b50a6d4 · b50a6d4
2 parents 9c91504 + 43bbfdf
commit b50a6d4
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
+          path: /convert
diff --git 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
+          path: /convert
diff --git 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