fixes aff/anti-aff placement constraints for VMOP webhook happiness

Author: srm09

pkg/services/vmoperator/constants.go

@@ -18,9 +18,6 @@ limitations under the License.
 package vmoperator
 
 const (
-	kubeTopologyZoneLabelKey = "topology.kubernetes.io/zone"
-	kubeHostNameLabelKey     = "kubernetes.io/hostname"
-
 	// ControlPlaneVMClusterModuleGroupName is the name used for the control plane Cluster Module.
 	ControlPlaneVMClusterModuleGroupName = "control-plane-group"
 	// ClusterModuleNameAnnotationKey is key for the Cluster Module annotation.

pkg/services/vmoperator/vmopmachine.go

@@ -194,7 +194,6 @@ func (v *VmopMachineService) ReconcileNormal(ctx context.Context, machineCtx cap
 	// Set the VM state. Will get reset throughout the reconcile
 	supervisorMachineCtx.VSphereMachine.Status.VMStatus = vmwarev1.VirtualMachineStatePending
 
-	// var vmAffinitySpec *vmoprv1.VirtualMachineAffinitySpec
 	var affInfo affinityInfo
 	if feature.Gates.Enabled(feature.NodeAutoPlacement) &&
 		!infrautilv1.IsControlPlaneMachine(machineCtx.GetVSphereMachine()) {
@@ -233,6 +232,21 @@ func (v *VmopMachineService) ReconcileNormal(ctx context.Context, machineCtx cap
 			affInfo.failureDomain = ptr.To(zone)
 		}
 
+		// Fetch machine deployments without explicit failureDomain specified
+		// to use when setting the anti-affinity rules
+		machineDeployments := &clusterv1.MachineDeploymentList{}
+		if err := v.Client.List(ctx, machineDeployments,
+			client.InNamespace(supervisorMachineCtx.Cluster.Namespace),
+			client.MatchingLabels{clusterv1.ClusterNameLabel: supervisorMachineCtx.Cluster.Name}); err != nil {
+			return false, err
+		}
+		mdNames := []string{}
+		for _, machineDeployment := range machineDeployments.Items {
+			if machineDeployment.Spec.Template.Spec.FailureDomain == "" && machineDeployment.Name != nodePool {
+				mdNames = append(mdNames, machineDeployment.Name)
+			}
+		}
+
 		affInfo.vmAffinitySpec = &vmoprv1.VirtualMachineAffinitySpec{
 			VMAffinity: &vmoprv1.VirtualMachineAffinityVMAffinitySpec{
 				RequiredDuringSchedulingIgnoredDuringExecution: []vmoprv1.VMAffinityTerm{
@@ -242,7 +256,7 @@ func (v *VmopMachineService) ReconcileNormal(ctx context.Context, machineCtx cap
 								clusterv1.MachineDeploymentNameLabel: nodePool,
 							},
 						},
-						TopologyKey: kubeTopologyZoneLabelKey,
+						TopologyKey: corev1.LabelTopologyZone,
 					},
 				},
 			},
@@ -253,14 +267,8 @@ func (v *VmopMachineService) ReconcileNormal(ctx context.Context, machineCtx cap
 							MatchLabels: map[string]string{
 								clusterv1.MachineDeploymentNameLabel: nodePool,
 							},
-							MatchExpressions: []metav1.LabelSelectorRequirement{
-								{
-									Key:      clusterv1.MachineControlPlaneLabel,
-									Operator: metav1.LabelSelectorOpDoesNotExist,
-								},
-							},
 						},
-						TopologyKey: kubeHostNameLabelKey,
+						TopologyKey: corev1.LabelHostname,
 					},
 				},
 				PreferredDuringSchedulingIgnoredDuringExecution: []vmoprv1.VMAffinityTerm{
@@ -269,16 +277,12 @@ func (v *VmopMachineService) ReconcileNormal(ctx context.Context, machineCtx cap
 							MatchExpressions: []metav1.LabelSelectorRequirement{
 								{
 									Key:      clusterv1.MachineDeploymentNameLabel,
-									Operator: metav1.LabelSelectorOpNotIn,
-									Values:   []string{nodePool},
-								},
-								{
-									Key:      clusterv1.MachineControlPlaneLabel,
-									Operator: metav1.LabelSelectorOpDoesNotExist,
+									Operator: metav1.LabelSelectorOpIn,
+									Values:   mdNames,
 								},
 							},
 						},
-						TopologyKey: kubeTopologyZoneLabelKey,
+						TopologyKey: corev1.LabelTopologyZone,
 					},
 				},
 			},
@@ -845,7 +849,7 @@ func (v *VmopMachineService) addVolumes(ctx context.Context, supervisorMachineCt
 
 		if zone := supervisorMachineCtx.VSphereMachine.Spec.FailureDomain; zonal && zone != nil {
 			topology := []map[string]string{
-				{kubeTopologyZoneLabelKey: *zone},
+				{corev1.LabelTopologyZone: *zone},
 			}
 			b, err := json.Marshal(topology)
 			if err != nil {
@@ -930,12 +934,12 @@ func getTopologyLabels(supervisorMachineCtx *vmware.SupervisorMachineContext, fa
 	// TODO: Make it so that we always set the zone label, might require enquiring the zones present (when unset)
 	if fd := supervisorMachineCtx.VSphereMachine.Spec.FailureDomain; fd != nil && *fd != "" {
 		return map[string]string{
-			kubeTopologyZoneLabelKey: *fd,
+			corev1.LabelTopologyZone: *fd,
 		}
 	}
 	if failureDomain != nil && *failureDomain != "" {
 		return map[string]string{
-			kubeTopologyZoneLabelKey: *failureDomain,
+			corev1.LabelTopologyZone: *failureDomain,
 		}
 	}
 	return nil