Skip to content

Commit 14f9fc5

Browse files
committed
Remove the placeholder caBundle
Kubernetes 1.31 will no longer allow the caBundle field to continuously reconcile to an invalid value. We'll fix this by leaving it blank. See kubernetes-sigs/cluster-api#10972 for more details. Signed-off-by: Nolan Brubaker <[email protected]>
1 parent d5ccaa9 commit 14f9fc5

9 files changed

+0
-27
lines changed

config/crd/patches/webhook_in_awsclustercontrolleridentities.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ spec:
1010
webhook:
1111
conversionReviewVersions: ["v1", "v1beta1"]
1212
clientConfig:
13-
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
14-
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
15-
caBundle: Cg==
1613
service:
1714
namespace: system
1815
name: webhook-service

config/crd/patches/webhook_in_awsclusterroleidentities.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ spec:
1010
webhook:
1111
conversionReviewVersions: ["v1", "v1beta1"]
1212
clientConfig:
13-
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
14-
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
15-
caBundle: Cg==
1613
service:
1714
namespace: system
1815
name: webhook-service

config/crd/patches/webhook_in_awsclustertemplates.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ spec:
1010
webhook:
1111
conversionReviewVersions: ["v1", "v1beta1"]
1212
clientConfig:
13-
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
14-
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
15-
caBundle: Cg==
1613
service:
1714
namespace: system
1815
name: webhook-service

config/crd/patches/webhook_in_awsmachinepools.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ spec:
88
conversion:
99
strategy: Webhook
1010
webhookClientConfig:
11-
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
12-
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
13-
caBundle: Cg==
1411
service:
1512
namespace: system
1613
name: webhook-service

config/crd/patches/webhook_in_awsmachines.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ spec:
1010
webhook:
1111
conversionReviewVersions: ["v1", "v1beta1"]
1212
clientConfig:
13-
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
14-
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
15-
caBundle: Cg==
1613
service:
1714
namespace: system
1815
name: webhook-service

config/crd/patches/webhook_in_awsmachinetemplates.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ spec:
1010
webhook:
1111
conversionReviewVersions: ["v1", "v1beta1"]
1212
clientConfig:
13-
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
14-
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
15-
caBundle: Cg==
1613
service:
1714
namespace: system
1815
name: webhook-service

config/crd/patches/webhook_in_awsmanagedcontrolplanes.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ spec:
1010
webhook:
1111
conversionReviewVersions: ["v1", "v1beta1"]
1212
clientConfig:
13-
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
14-
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
15-
caBundle: Cg==
1613
service:
1714
namespace: system
1815
name: webhook-service

config/crd/patches/webhook_in_eksconfigs.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ spec:
1010
webhook:
1111
conversionReviewVersions: ["v1", "v1beta1"]
1212
clientConfig:
13-
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
14-
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
15-
caBundle: Cg==
1613
service:
1714
namespace: system
1815
name: webhook-service

config/crd/patches/webhook_in_eksconfigtemplates.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ spec:
1010
webhook:
1111
conversionReviewVersions: ["v1", "v1beta1"]
1212
clientConfig:
13-
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
14-
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
15-
caBundle: Cg==
1613
service:
1714
namespace: system
1815
name: webhook-service

0 commit comments

Comments
 (0)