vmgroup: fixes membership and zone label key

Author: srm09

controllers/vmware/virtualmachinegroup_reconciler.go

@@ -385,6 +385,7 @@ func getCurrentVSphereMachines(ctx context.Context, kubeClient client.Client, cl
 	if err := kubeClient.List(ctx, &vsMachineList,
 		client.InNamespace(clusterNamespace),
 		client.MatchingLabels{clusterv1.ClusterNameLabel: clusterName},
+		client.HasLabels{clusterv1.MachineDeploymentNameLabel},
 	); err != nil {
 		return nil, errors.Wrapf(err, "failed to list VSphereMachines in namespace %s", clusterNamespace)
 	}
@@ -440,7 +441,7 @@ func GenerateVMGPlacementLabels(ctx context.Context, vmg *vmoprv1.VirtualMachine
 				}
 
 				log.Info(fmt.Sprintf("VM %s in VMG %s/%s has been placed in zone %s", member.Name, vmg.Namespace, vmg.Name, zone))
-				labels[md] = zone
+				labels[fmt.Sprintf("zone.cluster.x-k8s.io/%s", md)] = zone
 			}
 		}
 	}