Merge pull request #12098 from fabriziopandini/add-status-initialization-to-Cluster-Machine-MachinePool

⚠️ Add initialization to Cluster status

Author: k8s-ci-robot

api/v1beta1/conversion.go

@@ -172,6 +172,12 @@ func Convert_v1beta2_ClusterStatus_To_v1beta1_ClusterStatus(in *clusterv1.Cluste
 		out.FailureMessage = in.Deprecated.V1Beta1.FailureMessage
 	}
 
+	// Move initialization to old fields
+	if in.Initialization != nil {
+		out.ControlPlaneReady = in.Initialization.ControlPlaneInitialized
+		out.InfrastructureReady = in.Initialization.InfrastructureProvisioned
+	}
+
 	// Move new conditions (v1beta2), controlPlane and workers counters to the v1beta2 field.
 	if in.Conditions == nil && in.ControlPlane == nil && in.Workers == nil {
 		return nil
@@ -231,6 +237,15 @@ func Convert_v1beta1_ClusterStatus_To_v1beta2_ClusterStatus(in *ClusterStatus, o
 		}
 	}
 
+	// Move ControlPlaneReady and InfrastructureReady to Initialization
+	if in.ControlPlaneReady || in.InfrastructureReady {
+		if out.Initialization == nil {
+			out.Initialization = &clusterv1.ClusterInitializationStatus{}
+		}
+		out.Initialization.ControlPlaneInitialized = in.ControlPlaneReady
+		out.Initialization.InfrastructureProvisioned = in.InfrastructureReady
+	}
+
 	// Move legacy conditions (v1beta1), FailureReason and FailureMessage to the deprecated field.
 	if in.Conditions == nil && in.FailureReason == nil && in.FailureMessage == nil {
 		return nil

api/v1beta1/conversion_test.go

@@ -83,6 +83,13 @@ func hubClusterStatus(in *clusterv1.ClusterStatus, c fuzz.Continue) {
 			in.Deprecated = nil
 		}
 	}
+
+	// Drop empty structs with only omit empty fields.
+	if in.Initialization != nil {
+		if reflect.DeepEqual(in.Initialization, &clusterv1.ClusterInitializationStatus{}) {
+			in.Initialization = nil
+		}
+	}
 }
 
 func spokeClusterStatus(in *ClusterStatus, c fuzz.Continue) {

api/v1beta1/zz_generated.conversion.go

@@ -965,6 +965,11 @@ type ClusterStatus struct {
 	// +kubebuilder:validation:MaxItems=32
 	Conditions []metav1.Condition `json:"conditions,omitempty"`
 
+	// initialization provides observations of the Cluster initialization process.
+	// NOTE: Fields in this struct are part of the Cluster API contract and are used to orchestrate initial Cluster provisioning.
+	// +optional
+	Initialization *ClusterInitializationStatus `json:"initialization,omitempty"`
+
 	// controlPlane groups all the observations about Cluster's ControlPlane current state.
 	// +optional
 	ControlPlane *ClusterControlPlaneStatus `json:"controlPlane,omitempty"`
@@ -982,18 +987,6 @@ type ClusterStatus struct {
 	// +kubebuilder:validation:Enum=Pending;Provisioning;Provisioned;Deleting;Failed;Unknown
 	Phase string `json:"phase,omitempty"`
 
-	// infrastructureReady is the state of the infrastructure provider.
-	// +optional
-	InfrastructureReady bool `json:"infrastructureReady"`
-
-	// controlPlaneReady denotes if the control plane became ready during initial provisioning
-	// to receive requests.
-	// NOTE: this field is part of the Cluster API contract and it is used to orchestrate provisioning.
-	// The value of this field is never updated after provisioning is completed. Please use conditions
-	// to check the operational state of the control plane.
-	// +optional
-	ControlPlaneReady bool `json:"controlPlaneReady"`
-
 	// observedGeneration is the latest generation observed by the controller.
 	// +optional
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
@@ -1003,6 +996,27 @@ type ClusterStatus struct {
 	Deprecated *ClusterDeprecatedStatus `json:"deprecated,omitempty"`
 }
 
+// ClusterInitializationStatus provides observations of the Cluster initialization process.
+// NOTE: Fields in this struct are part of the Cluster API contract and are used to orchestrate initial Cluster provisioning.
+
+// ClusterInitializationStatus provides observations of the Cluster initialization process.
+type ClusterInitializationStatus struct {
+	// infrastructureProvisioned is true when the infrastructure provider reports that Cluster's infrastructure is fully provisioned.
+	// NOTE: this field is part of the Cluster API contract, and it is used to orchestrate provisioning.
+	// The value of this field is never updated after provisioning is completed.
+	// +optional
+	InfrastructureProvisioned bool `json:"infrastructureProvisioned"`
+
+	// controlPlaneInitialized denotes when the control plane is functional enough to accept requests.
+	// This information is usually used as a signal for starting all the provisioning operations that depends on
+	// a functional API server, but do not require a full HA control plane to exists, like e.g. join worker Machines,
+	// install core addons like CNI, CPI, CSI etc.
+	// NOTE: this field is part of the Cluster API contract, and it is used to orchestrate provisioning.
+	// The value of this field is never updated after initialization is completed.
+	// +optional
+	ControlPlaneInitialized bool `json:"controlPlaneInitialized"`
+}
+
 // ClusterDeprecatedStatus groups all the status fields that are deprecated and will be removed in a future version.
 // See https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more context.
 type ClusterDeprecatedStatus struct {

api/v1beta2/cluster_types.go

@@ -139,7 +139,7 @@ func (r *KubeadmConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl
 		builder.WithPredicates(
 			predicates.All(mgr.GetScheme(), predicateLog,
 				predicates.ResourceIsChanged(mgr.GetScheme(), predicateLog),
-				predicates.ClusterPausedTransitionsOrInfrastructureReady(mgr.GetScheme(), predicateLog),
+				predicates.ClusterPausedTransitionsOrInfrastructureProvisioned(mgr.GetScheme(), predicateLog),
 				predicates.ResourceHasFilterLabel(mgr.GetScheme(), predicateLog, r.WatchFilterValue),
 			),
 		),
@@ -291,8 +291,8 @@ func (r *KubeadmConfigReconciler) reconcile(ctx context.Context, scope *Scope, c
 		return ctrl.Result{}, err
 	}
 	switch {
-	// Wait for the infrastructure to be ready.
-	case !cluster.Status.InfrastructureReady:
+	// Wait for the infrastructure to be provisioned.
+	case (cluster.Status.Initialization == nil || !cluster.Status.Initialization.InfrastructureProvisioned):
 		log.Info("Cluster infrastructure is not ready, waiting")
 		v1beta1conditions.MarkFalse(config, bootstrapv1.DataSecretAvailableV1Beta1Condition, bootstrapv1.WaitingForClusterInfrastructureV1Beta1Reason, clusterv1.ConditionSeverityInfo, "")
 		conditions.Set(scope.Config, metav1.Condition{