Skip to content

Commit 97ed2ed

Browse files
authored
rm caBundle (#433)
## Description Drop caBundle from CRDs to support Kubernetes 1.31 kubernetes-sigs/cluster-api#10972 ## Why is this needed Allow provider to work with k8s 1.31 Fixes: # ``` message: 'action failed after 10 attempts: failed to patch provider object: CustomResourceDefinition.apiextensions.k8s.io "tinkerbellclusters.infrastructure.cluster.x-k8s.io" is invalid: spec.conversion.webhookClientConfig.caBundle: Invalid value: []byte{0xa}: unable to load root certificates: unable to parse bytes as PEM block' ``` Tests: Deployed on local k8s 1.31, with tilt.
2 parents 05c0684 + fc12604 commit 97ed2ed

3 files changed

+0
-9
lines changed

config/crd/patches/webhook_in_tinkerbellclusters.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_tinkerbellmachines.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_tinkerbellmachinetemplates.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)