From 33e6b89bfb460361abbdcd6b43dd944ad3883a6b Mon Sep 17 00:00:00 2001
From: Kubernetes Prow Robot <20407524+k8s-ci-robot@users.noreply.github.com>
Date: Mon, 28 Apr 2025 12:39:54 -0700
Subject: [PATCH] Merge pull request #12107 from Amulyam24/token

:bug: Make joinConfiguration.discovery.bootstrapToken.token optional
---
 bootstrap/kubeadm/api/v1beta1/kubeadm_types.go                | 4 ++--
 .../crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml  | 2 --
 .../bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml    | 2 --
 .../controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml   | 2 --
 ...olplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml | 2 --
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/bootstrap/kubeadm/api/v1beta1/kubeadm_types.go b/bootstrap/kubeadm/api/v1beta1/kubeadm_types.go
index 7b732193d1b3..97f7dafca20c 100644
--- a/bootstrap/kubeadm/api/v1beta1/kubeadm_types.go
+++ b/bootstrap/kubeadm/api/v1beta1/kubeadm_types.go
@@ -584,10 +584,10 @@ type Discovery struct {
 type BootstrapTokenDiscovery struct {
 	// token is a token used to validate cluster information
 	// fetched from the control-plane.
-	// +required
+	// +optional
 	// +kubebuilder:validation:MinLength=1
 	// +kubebuilder:validation:MaxLength=512
-	Token string `json:"token"`
+	Token string `json:"token,omitempty"`
 
 	// apiServerEndpoint is an IP or domain name to the API server from which info will be fetched.
 	// +optional
diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
index 4c14414f121c..ab4a665a5ed5 100644
--- a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
+++ b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
@@ -3439,8 +3439,6 @@ spec:
                               without CA verification via CACertHashes. This can weaken
                               the security of kubeadm since other nodes can impersonate the control-plane.
                             type: boolean
-                        required:
-                        - token
                         type: object
                       file:
                         description: |-
diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
index 4917383f10ba..06caff1ed3e1 100644
--- a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
+++ b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
@@ -3422,8 +3422,6 @@ spec:
                                       without CA verification via CACertHashes. This can weaken
                                       the security of kubeadm since other nodes can impersonate the control-plane.
                                     type: boolean
-                                required:
-                                - token
                                 type: object
                               file:
                                 description: |-
diff --git a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml
index 7a332a201406..23e5cc370bd9 100644
--- a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml
+++ b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanes.yaml
@@ -3925,8 +3925,6 @@ spec:
                                   without CA verification via CACertHashes. This can weaken
                                   the security of kubeadm since other nodes can impersonate the control-plane.
                                 type: boolean
-                            required:
-                            - token
                             type: object
                           file:
                             description: |-
diff --git a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml
index 6be0c5a43fe7..804ab872529f 100644
--- a/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml
+++ b/controlplane/kubeadm/config/crd/bases/controlplane.cluster.x-k8s.io_kubeadmcontrolplanetemplates.yaml
@@ -2648,8 +2648,6 @@ spec:
                                           without CA verification via CACertHashes. This can weaken
                                           the security of kubeadm since other nodes can impersonate the control-plane.
                                         type: boolean
-                                    required:
-                                    - token
                                     type: object
                                   file:
                                     description: |-