Merge pull request #12540 from fabriziopandini/stop-requiring-init-or-cluster-configuration

✨ Stop requiring init or cluster configuration for first CP machine

Author: k8s-ci-robot

api/bootstrap/kubeadm/v1beta2/kubeadm_types.go

@@ -73,6 +73,7 @@ const (
 
 // InitConfiguration contains a list of elements that is specific "kubeadm init"-only runtime
 // information.
+// +kubebuilder:validation:MinProperties=1
 type InitConfiguration struct {
 	// bootstrapTokens is respected at `kubeadm init` time and describes a set of Bootstrap Tokens to create.
 	// This information IS NOT uploaded to the kubeadm cluster configmap, partly because of its sensitive nature
@@ -119,6 +120,7 @@ type InitConfiguration struct {
 }
 
 // ClusterConfiguration contains cluster-wide configuration for a kubeadm cluster.
+// +kubebuilder:validation:MinProperties=1
 type ClusterConfiguration struct {
 	// etcd holds configuration for etcd.
 	// NB: This value defaults to a Local (stacked) etcd
@@ -545,6 +547,7 @@ type ExternalEtcd struct {
 }
 
 // JoinConfiguration contains elements describing a particular node.
+// +kubebuilder:validation:MinProperties=1
 type JoinConfiguration struct {
 	// nodeRegistration holds fields that relate to registering the new control-plane node to the cluster.
 	// When used in the context of control plane nodes, NodeRegistration should remain consistent

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

@@ -494,12 +494,6 @@ func (r *KubeadmConfigReconciler) handleClusterNotInitialized(ctx context.Contex
 		return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
 	}
 
-	// if the machine has not ClusterConfiguration and InitConfiguration, requeue
-	if scope.Config.Spec.InitConfiguration == nil && scope.Config.Spec.ClusterConfiguration == nil {
-		scope.Info("Control plane is not ready, requeuing joining control planes until ready.")
-		return ctrl.Result{RequeueAfter: 30 * time.Second}, nil
-	}
-
 	machine := &clusterv1.Machine{}
 	if err := runtime.DefaultUnstructuredConverter.FromUnstructured(scope.ConfigOwner.Object, machine); err != nil {
 		return ctrl.Result{}, errors.Wrapf(err, "cannot convert %s to Machine", scope.ConfigOwner.GetKind())

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

@@ -426,6 +426,7 @@ func TestKubeadmConfigReconciler_Reconcile_RequeueJoiningNodesIfControlPlaneNotI
 		name    string
 		request ctrl.Request
 		objects []client.Object
+		lock    bool
 	}{
 		{
 			name: "requeue worker when control plane is not yet initialized",
@@ -454,6 +455,7 @@ func TestKubeadmConfigReconciler_Reconcile_RequeueJoiningNodesIfControlPlaneNotI
 				controlPlaneJoinMachine,
 				controlPlaneJoinConfig,
 			},
+			lock: true,
 		},
 	}
 	for _, tc := range testcases {
@@ -468,6 +470,10 @@ func TestKubeadmConfigReconciler_Reconcile_RequeueJoiningNodesIfControlPlaneNotI
 				KubeadmInitLock:     &myInitLocker{},
 			}
 
+			if tc.lock {
+				k.KubeadmInitLock.Lock(ctx, nil, nil)
+			}
+
 			result, err := k.Reconcile(ctx, tc.request)
 			g.Expect(err).ToNot(HaveOccurred())
 			g.Expect(result.Requeue).To(BeFalse())
@@ -1944,6 +1950,7 @@ func TestKubeadmConfigReconciler_Reconcile_AlwaysCheckCAVerificationUnlessReques
 			}
 
 			wc := newWorkerJoinKubeadmConfig(metav1.NamespaceDefault, "worker-join-cfg")
+			wc.Spec.JoinConfiguration = &bootstrapv1.JoinConfiguration{}
 			wc.Spec.JoinConfiguration.Discovery.BootstrapToken = tc.discovery
 			key := client.ObjectKey{Namespace: wc.Namespace, Name: wc.Name}
 			err := myclient.Create(ctx, wc)
@@ -2576,11 +2583,7 @@ func newKubeadmConfig(namespace, name string) *bootstrapv1.KubeadmConfig {
 
 // newKubeadmConfig return a CABPK KubeadmConfig object with a worker JoinConfiguration.
 func newWorkerJoinKubeadmConfig(namespace, name string) *bootstrapv1.KubeadmConfig {
-	return bootstrapbuilder.KubeadmConfig(namespace, name).
-		WithJoinConfig(&bootstrapv1.JoinConfiguration{
-			ControlPlane: nil,
-		}).
-		Build()
+	return bootstrapbuilder.KubeadmConfig(namespace, name).Build()
 }
 
 // newKubeadmConfig returns a CABPK KubeadmConfig object with a ControlPlane JoinConfiguration.
@@ -2594,10 +2597,7 @@ func newControlPlaneJoinKubeadmConfig(namespace, name string) *bootstrapv1.Kubea
 
 // newControlPlaneJoinConfig returns a CABPK KubeadmConfig object with a ControlPlane InitConfiguration and ClusterConfiguration.
 func newControlPlaneInitKubeadmConfig(namespace, name string) *bootstrapv1.KubeadmConfig {
-	return bootstrapbuilder.KubeadmConfig(namespace, name).
-		WithInitConfig(&bootstrapv1.InitConfiguration{}).
-		WithClusterConfig(&bootstrapv1.ClusterConfiguration{}).
-		Build()
+	return bootstrapbuilder.KubeadmConfig(namespace, name).Build()
 }
 
 // addKubeadmConfigToMachine adds the config details to the passed Machine, and adds the Machine to the KubeadmConfig as an ownerReference.

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

@@ -223,9 +223,6 @@ func getGetFailureDomainIDs(failureDomains []clusterv1.FailureDomain) []string {
 // InitialControlPlaneConfig returns a new KubeadmConfigSpec that is to be used for an initializing control plane.
 func (c *ControlPlane) InitialControlPlaneConfig() *bootstrapv1.KubeadmConfigSpec {
 	bootstrapSpec := c.KCP.Spec.KubeadmConfigSpec.DeepCopy()
-	if bootstrapSpec.InitConfiguration == nil {
-		bootstrapSpec.InitConfiguration = &bootstrapv1.InitConfiguration{}
-	}
 	bootstrapSpec.JoinConfiguration = nil
 	return bootstrapSpec
 }

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go

@@ -1740,8 +1740,7 @@ func TestKubeadmControlPlaneReconciler_syncMachines(t *testing.T) {
 
 	// Existing KubeadmConfig
 	bootstrapSpec := &bootstrapv1.KubeadmConfigSpec{
-		Users:             []bootstrapv1.User{{Name: "test-user"}},
-		JoinConfiguration: &bootstrapv1.JoinConfiguration{},
+		Users: []bootstrapv1.User{{Name: "test-user"}},
 	}
 	existingKubeadmConfig := &bootstrapv1.KubeadmConfig{
 		TypeMeta: metav1.TypeMeta{

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

@@ -372,9 +372,7 @@ func TestCloneConfigsAndGenerateMachine(t *testing.T) {
 		recorder:            record.NewFakeRecorder(32),
 	}
 
-	bootstrapSpec := &bootstrapv1.KubeadmConfigSpec{
-		JoinConfiguration: &bootstrapv1.JoinConfiguration{},
-	}
+	bootstrapSpec := &bootstrapv1.KubeadmConfigSpec{}
 	_, err := r.cloneConfigsAndGenerateMachine(ctx, cluster, kcp, bootstrapSpec, "")
 	g.Expect(err).To(Succeed())