Merge pull request #1692 from vincepri/fix-md-selector

🐛 Fix MachineDeployment Status.Selector not being populated

Author: k8s-ci-robot

controllers/machinedeployment_controller.go

@@ -132,10 +132,6 @@ func (r *MachineDeploymentReconciler) reconcile(ctx context.Context, d *clusterv
 		return ctrl.Result{}, errors.Errorf("failed validation on MachineDeployment %q label selector, cannot match Machine template labels", d.Name)
 	}
 
-	// Copy label selector to its status counterpart in string format.
-	// This is necessary for CRDs including scale subresources.
-	d.Status.Selector = selector.String()
-
 	// Cluster might be nil as some providers might not require a cluster object
 	// for machine management.
 	cluster, err := util.GetClusterFromMetadata(ctx, r.Client, d.ObjectMeta)

controllers/machinedeployment_controller_test.go

@@ -296,6 +296,9 @@ var _ = Describe("MachineDeployment Reconciler", func() {
 
 			return len(machineSets.Items)
 		}, timeout*5).Should(BeEquivalentTo(0))
+
+		// Make sure the deployment selector is being populated.
+		Expect(deployment.Status.Selector).ToNot(BeEmpty())
 	})
 })
 

controllers/machinedeployment_sync.go

@@ -358,9 +358,13 @@ func calculateStatus(allMSs []*clusterv1.MachineSet, newMS *clusterv1.MachineSet
 		unavailableReplicas = 0
 	}
 
+	// Calculate the label selector. We check the error in the MD reconcile function, ignore here.
+	selector, _ := metav1.LabelSelectorAsSelector(&deployment.Spec.Selector) //nolint
+
 	status := clusterv1.MachineDeploymentStatus{
 		// TODO: Ensure that if we start retrying status updates, we won't pick up a new Generation value.
 		ObservedGeneration:  deployment.Generation,
+		Selector:            selector.String(),
 		Replicas:            mdutil.GetActualReplicaCountForMachineSets(allMSs),
 		UpdatedReplicas:     mdutil.GetActualReplicaCountForMachineSets([]*clusterv1.MachineSet{newMS}),
 		ReadyReplicas:       mdutil.GetReadyReplicaCountForMachineSets(allMSs),