Fix annotations

Signed-off-by: Gong Zhang <[email protected]>

Author: zhanggbj

controllers/vmware/virtualmachinegroup_reconciler.go

@@ -187,20 +187,24 @@ func (r *VirtualMachineGroupReconciler) createOrUpdateVMG(ctx context.Context, c
 			desiredVMG.Labels[clusterv1.ClusterNameLabel] = cluster.Name
 		}
 
+		if desiredVMG.Annotations == nil {
+			desiredVMG.Annotations = make(map[string]string)
+		}
+
 		// Add per-md-zone label for day-2 operations once placement of a VM belongs to MachineDeployment is done
 		// Do not update per-md-zone label once set, as placement decision should not change without user explicitly
 		// ask.
-		placementDecisionLabels, err := GenerateVMGPlacementAnnotations(ctx, desiredVMG, mdNames)
+		placementDecisionAnnotations, err := GenerateVMGPlacementAnnotations(ctx, desiredVMG, mdNames)
 		if err != nil {
 			return err
 		}
-		if len(placementDecisionLabels) > 0 {
-			for k, v := range placementDecisionLabels {
-				if _, exists := desiredVMG.Labels[k]; exists {
+		if len(placementDecisionAnnotations) > 0 {
+			for k, v := range placementDecisionAnnotations {
+				if _, exists := desiredVMG.Annotations[k]; exists {
 					// Skip if the label already exists
 					continue
 				}
-				desiredVMG.Labels[k] = v
+				desiredVMG.Annotations[k] = v
 			}
 		}
 
@@ -304,7 +308,7 @@ func GenerateVMGPlacementAnnotations(ctx context.Context, vmg *vmoprv1.VirtualMa
 
 			// Check if VM belongs to a Machine Deployment by name (e.g. cluster-1-np-1-vm-xxx contains np-1)
 			// TODO: Establish membership via the machine deployment name label
-			if strings.Contains(member.Name, "-"+md+"-") {
+			if strings.Contains(member.Name, md+"-") {
 				// Get the VM placement information by member status.
 				// VMs that have undergone placement do not have Placement info set, skip.
 				if member.Placement == nil {

controllers/vmware/virtualmachinegroup_reconciler_test.go

@@ -199,10 +199,10 @@ func TestGenerateVMGPlacementAnnotations(t *testing.T) {
 					},
 				},
 			},
-			machineDeployments: []string{mdName1, mdName2},
+			machineDeployments: []string{clusterName + mdName1, clusterName + mdName2},
 			wantAnnotations: map[string]string{
-				fmt.Sprintf("zone.cluster.x-k8s.io/%s", mdName1): zoneA,
-				fmt.Sprintf("zone.cluster.x-k8s.io/%s", mdName2): zoneB,
+				fmt.Sprintf("zone.cluster.x-k8s.io/%s", clusterName+mdName1): zoneA,
+				fmt.Sprintf("zone.cluster.x-k8s.io/%s", clusterName+mdName2): zoneB,
 			},
 			wantErr: false,
 		},
@@ -215,7 +215,7 @@ func TestGenerateVMGPlacementAnnotations(t *testing.T) {
 					},
 				},
 			},
-			machineDeployments: []string{mdName1},
+			machineDeployments: []string{clusterName + mdName1},
 			wantAnnotations:    map[string]string{},
 			wantErr:            false,
 		},
@@ -228,7 +228,7 @@ func TestGenerateVMGPlacementAnnotations(t *testing.T) {
 					},
 				},
 			},
-			machineDeployments: []string{mdName1},
+			machineDeployments: []string{clusterName + mdName1},
 			wantAnnotations:    map[string]string{},
 			wantErr:            false,
 		},
@@ -244,9 +244,9 @@ func TestGenerateVMGPlacementAnnotations(t *testing.T) {
 					},
 				},
 			},
-			machineDeployments: []string{mdName1},
+			machineDeployments: []string{clusterName + mdName1},
 			wantAnnotations: map[string]string{
-				fmt.Sprintf("zone.cluster.x-k8s.io/%s", mdName1): zoneA,
+				fmt.Sprintf("zone.cluster.x-k8s.io/%s", clusterName+mdName1): zoneA,
 			},
 			wantErr: false,
 		},
@@ -260,7 +260,7 @@ func TestGenerateVMGPlacementAnnotations(t *testing.T) {
 					},
 				},
 			},
-			machineDeployments: []string{mdName1},
+			machineDeployments: []string{clusterName + mdName1},
 			wantAnnotations:    nil,
 			wantErr:            true,
 		},