Skip to content

Commit d42875c

Browse files
committed
Make joinConfiguration.discovery.bootstrapToken.token optional
1 parent d753f40 commit d42875c

6 files changed

+4
-20
lines changed

bootstrap/kubeadm/api/v1beta1/kubeadm_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -584,10 +584,10 @@ type Discovery struct {
584584
type BootstrapTokenDiscovery struct {
585585
// token is a token used to validate cluster information
586586
// fetched from the control-plane.
587-
// +required
587+
// +optional
588588
// +kubebuilder:validation:MinLength=1
589589
// +kubebuilder:validation:MaxLength=512
590-
Token string `json:"token"`
590+
Token string `json:"token,omitempty"`
591591

592592
// apiServerEndpoint is an IP or domain name to the API server from which info will be fetched.
593593
// +optional

bootstrap/kubeadm/api/v1beta2/kubeadm_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -628,10 +628,10 @@ type Discovery struct {
628628
type BootstrapTokenDiscovery struct {
629629
// token is a token used to validate cluster information
630630
// fetched from the control-plane.
631-
// +required
631+
// +optional
632632
// +kubebuilder:validation:MinLength=1
633633
// +kubebuilder:validation:MaxLength=512
634-
Token string `json:"token"`
634+
Token string `json:"token,omitempty"`
635635

636636
// apiServerEndpoint is an IP or domain name to the API server from which info will be fetched.
637637
// +optional

bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml

-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)