Updates VMOP API dependency

Author: srm09

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d
 	github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20241112044858-9da8637c1b0d
 	// The version of vm-operator should be kept in sync with the manifests at: config/deployments/integration-tests
-	github.com/vmware-tanzu/vm-operator/api v1.9.1-0.20250908141901-a9e1dfbc0045
+	github.com/vmware-tanzu/vm-operator/api v1.9.1-0.20251007154704-e2d6e85d9ec7
 	github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20240404200847-de75746a9505
 	github.com/vmware/govmomi v0.51.0
 )

go.sum

@@ -221,8 +221,8 @@ github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d h1:c
 github.com/vmware-tanzu/net-operator-api v0.0.0-20240326163340-1f32d6bf7f9d/go.mod h1:JbFOh22iDsT5BowJe0GgpMI5e2/S7cWaJlv9LdURVQM=
 github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20241112044858-9da8637c1b0d h1:z9lrzKVtNlujduv9BilzPxuge/LE2F0N1ms3TP4JZvw=
 github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20241112044858-9da8637c1b0d/go.mod h1:Q4JzNkNMvjo7pXtlB5/R3oME4Nhah7fAObWgghVmtxk=
-github.com/vmware-tanzu/vm-operator/api v1.9.1-0.20250908141901-a9e1dfbc0045 h1:zME8crazIAWVJGboJpSLl+qcRYQ8yA6hPQojz28gY5M=
-github.com/vmware-tanzu/vm-operator/api v1.9.1-0.20250908141901-a9e1dfbc0045/go.mod h1:hkc/QZCSHcosWWMPS6VWWR12WenZcNE3BaTJ/8A8sNE=
+github.com/vmware-tanzu/vm-operator/api v1.9.1-0.20251007154704-e2d6e85d9ec7 h1:VlnaiDKI1H1buwBOgL8R3HRB3EQNN96xMdz25vE5FUo=
+github.com/vmware-tanzu/vm-operator/api v1.9.1-0.20251007154704-e2d6e85d9ec7/go.mod h1:nWTPpxfe4gHuuYuFcrs86+NMxfkqPk3a3IlvI8TCWak=
 github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20240404200847-de75746a9505 h1:y4wXx1FUFqqSgJ/xUOEM1DLS2Uu0KaeLADWpzpioGTU=
 github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20240404200847-de75746a9505/go.mod h1:5rqRJ9zGR+KnKbkGx373WgN8xJpvAj99kHnfoDYRO5I=
 github.com/vmware/govmomi v0.51.0 h1:n3RLS9aw/irTOKbiIyJzAb6rOat4YOVv/uDoRsNTSQI=

pkg/services/vmoperator/vmopmachine.go

@@ -165,9 +165,9 @@ func (v *VmopMachineService) SyncFailureReason(_ context.Context, machineCtx cap
 }
 
 type affinityInfo struct {
-	vmAffinitySpec *vmoprv1.VirtualMachineAffinitySpec
-	vmGroupName    string
-	failureDomain  *string
+	affinitySpec  *vmoprv1.AffinitySpec
+	vmGroupName   string
+	failureDomain *string
 
 	// TODO: is this needed for the single zone case?
 	// zones []topologyv1.Zone
@@ -246,10 +246,12 @@ func (v *VmopMachineService) ReconcileNormal(ctx context.Context, machineCtx cap
 				mdNames = append(mdNames, machineDeployment.Name)
 			}
 		}
+		// turn to v4 log
+		log.V(2).Info("Gathered anti-affine MDs", "mdNames", mdNames)
 
-		affInfo.vmAffinitySpec = &vmoprv1.VirtualMachineAffinitySpec{
-			VMAffinity: &vmoprv1.VirtualMachineAffinityVMAffinitySpec{
-				RequiredDuringSchedulingIgnoredDuringExecution: []vmoprv1.VMAffinityTerm{
+		affInfo.affinitySpec = &vmoprv1.AffinitySpec{
+			VMAffinity: &vmoprv1.VMAffinitySpec{
+				RequiredDuringSchedulingPreferredDuringExecution: []vmoprv1.VMAffinityTerm{
 					{
 						LabelSelector: &metav1.LabelSelector{
 							MatchLabels: map[string]string{
@@ -260,7 +262,7 @@ func (v *VmopMachineService) ReconcileNormal(ctx context.Context, machineCtx cap
 					},
 				},
 			},
-			VMAntiAffinity: &vmoprv1.VirtualMachineAntiAffinityVMAffinitySpec{
+			VMAntiAffinity: &vmoprv1.VMAntiAffinitySpec{
 				PreferredDuringSchedulingPreferredDuringExecution: []vmoprv1.VMAffinityTerm{
 					{
 						LabelSelector: &metav1.LabelSelector{
@@ -270,8 +272,6 @@ func (v *VmopMachineService) ReconcileNormal(ctx context.Context, machineCtx cap
 						},
 						TopologyKey: corev1.LabelHostname,
 					},
-				},
-				PreferredDuringSchedulingIgnoredDuringExecution: []vmoprv1.VMAffinityTerm{
 					{
 						LabelSelector: &metav1.LabelSelector{
 							MatchExpressions: []metav1.LabelSelectorRequirement{
@@ -599,9 +599,9 @@ func (v *VmopMachineService) reconcileVMOperatorVM(ctx context.Context, supervis
 			vmOperatorVM = typedModified
 		}
 
-		if affinityInfo != nil && affinityInfo.vmAffinitySpec != nil {
+		if affinityInfo != nil && affinityInfo.affinitySpec != nil {
 			if vmOperatorVM.Spec.Affinity == nil {
-				vmOperatorVM.Spec.Affinity = affinityInfo.vmAffinitySpec
+				vmOperatorVM.Spec.Affinity = affinityInfo.affinitySpec
 			}
 			if vmOperatorVM.Spec.GroupName == "" {
 				vmOperatorVM.Spec.GroupName = affinityInfo.vmGroupName