ROUGH DRAFT - ClusterClass User Managed Worker Upgrades

api/core/v1beta1/cluster_types.go

@@ -682,6 +682,10 @@ type MachineDeploymentTopology struct {
 	// +kubebuilder:validation:MaxLength=256
 	Class string `json:"class"`
 
+	// version is the Kubernetes version of the worker group, can only be used if auto-upgrade is disabled.
+	// +optional
+	Version *string `json:"version,omitempty"`
+
 	// name is the unique identifier for this MachineDeploymentTopology.
 	// The value is used with other unique identifiers to create a MachineDeployment's Name
 	// (e.g. cluster's name, etc). In case the name is greater than the allowed maximum length,

api/core/v1beta2/cluster_types.go

@@ -818,6 +818,12 @@ type MachineDeploymentTopology struct {
 	// +optional
 	Metadata ObjectMeta `json:"metadata,omitempty,omitzero"`
 
+	//TODO: validation with auto-upgrade
+
+	// version is the Kubernetes version of the worker group, can only be used if auto-upgrade is disabled.
+	// +optional
+	Version *string `json:"version,omitempty"`
+
 	// class is the name of the MachineDeploymentClass used to create the set of worker nodes.
 	// This should match one of the deployment classes defined in the ClusterClass object
 	// mentioned in the `Cluster.Spec.Class` field.

bootstrap/kubeadm/config/default/manager_image_patch.yaml

@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-        - image: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:main
+        - image: igor-test-bootstrap-arm64:dev
           name: manager

config/default/manager_image_patch.yaml

@@ -7,5 +7,5 @@ spec:
   template:
     spec:
       containers:
-      - image: gcr.io/k8s-staging-cluster-api/cluster-api-controller:main
+      - image: igor-test-arm64:dev
         name: manager

exp/topology/desiredstate/desired_state.go

@@ -107,6 +107,8 @@ func (g *generator) Generate(ctx context.Context, s *scope.Scope) (*scope.Cluste
 		}
 	}
 
+	//TODO: remove MD from here if using user-managed
+
 	// Mark all the MachineDeployments that are currently upgrading.
 	// This captured information is used for:
 	// - Building the TopologyReconciled condition.
@@ -934,6 +936,11 @@ func (g *generator) computeMachineDeployment(ctx context.Context, s *scope.Scope
 // the current control plane and the version defined in the topology.
 func (g *generator) computeMachineDeploymentVersion(s *scope.Scope, machineDeploymentTopology clusterv1.MachineDeploymentTopology, currentMDState *scope.MachineDeploymentState) string {
 	desiredVersion := s.Blueprint.Topology.Version
+	if machineDeploymentTopology.Version != nil {
+		// Return early if the auto-upgrade is disabled.
+		return *machineDeploymentTopology.Version
+	}
+
 	// If creating a new machine deployment, mark it as pending if the control plane is not
 	// yet stable. Creating a new MD while the control plane is upgrading can lead to unexpected race conditions.
 	// Example: join could fail if the load balancers are slow in detecting when CP machines are

internal/controllers/machineset/machineset_preflight.go

@@ -212,6 +212,7 @@ func (r *Reconciler) kubeadmVersionPreflightCheck(cpSemver, msSemver semver.Vers
 	return nil
 }
 
+// TODO: this preflight check should always be skipped for MachineSets that are removed from topology auto version mgmt
 func (r *Reconciler) controlPlaneVersionPreflightCheck(cluster *clusterv1.Cluster, cpVersion, msVersion string) preflightCheckErrorMessage {
 	if feature.Gates.Enabled(feature.ClusterTopology) && cluster.Spec.Topology != nil {
 		if cpVersion != msVersion {