Added check to prevent duplicate failure domains in CPMS.

Author: vr4manta

pkg/asset/machines/vsphere/machines.go

@@ -83,9 +83,11 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine
 			"machine.openshift.io/cluster-api-machine-type": role,
 		}
 
-		failureDomains = append(failureDomains, machinev1.VSphereFailureDomain{
-			Name: failureDomain.Name,
-		})
+		if !hasFailureDomain(failureDomains, failureDomain.Name) {
+			failureDomains = append(failureDomains, machinev1.VSphereFailureDomain{
+				Name: failureDomain.Name,
+			})
+		}
 
 		osImageForZone := failureDomain.Topology.Template
 		if failureDomain.Topology.Template == "" {
@@ -255,3 +257,12 @@ func provider(clusterID string, vcenter *vsphere.VCenter, failureDomain vsphere.
 // ConfigMasters sets the PublicIP flag and assigns a set of load balancers to the given machines
 func ConfigMasters(machines []machineapi.Machine, clusterID string) {
 }
+
+func hasFailureDomain(failureDomains []machinev1.VSphereFailureDomain, failureDomain string) bool {
+	for _, fd := range failureDomains {
+		if fd.Name == failureDomain {
+			return true
+		}
+	}
+	return false
+}

pkg/asset/machines/vsphere/machines_test.go

@@ -215,6 +215,26 @@ var machinePoolReducedZones = types.MachinePool{
 	Architecture:   types.ArchitectureAMD64,
 }
 
+var machinePoolSingleZones = types.MachinePool{
+	Name:     "master",
+	Replicas: &machinePoolReplicas,
+	Platform: types.MachinePoolPlatform{
+		VSphere: &vsphere.MachinePool{
+			NumCPUs:           4,
+			NumCoresPerSocket: 2,
+			MemoryMiB:         16384,
+			OSDisk: vsphere.OSDisk{
+				DiskSizeGB: 60,
+			},
+			Zones: []string{
+				"deployzone-us-east-1a",
+			},
+		},
+	},
+	Hyperthreading: "true",
+	Architecture:   types.ArchitectureAMD64,
+}
+
 var machinePoolUndefinedZones = types.MachinePool{
 	Name:     "master",
 	Replicas: &machinePoolReplicas,
@@ -344,6 +364,21 @@ func TestConfigMasters(t *testing.T) {
 				},
 			},
 		},
+		{
+			testCase:                   "all masters in single zone / pool",
+			machinePool:                &machinePoolSingleZones,
+			maxAllowedWorkspaceMatches: 3,
+			installConfig:              installConfig,
+			workspaces: []machineapi.Workspace{
+				{
+					Server:       "your.vcenter.example.com",
+					Datacenter:   "dc1",
+					Folder:       "/dc1/vm/folder1",
+					Datastore:    "/dc1/datastore/datastore1",
+					ResourcePool: "/dc1/host/c1/Resources/rp1",
+				},
+			},
+		},
 		{
 			testCase:                   "full path to cluster resource pool when no pool provided via placement constraint",
 			machinePool:                &machinePoolValidZones,
@@ -378,7 +413,7 @@ func TestConfigMasters(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.testCase, func(t *testing.T) {
-			machines, _, err := Machines(clusterID, tc.installConfig, tc.machinePool, "", "", "")
+			machines, cpms, err := Machines(clusterID, tc.installConfig, tc.machinePool, "", "", "")
 			assertOnUnexpectedErrorState(t, tc.expectedError, err)
 
 			if len(tc.workspaces) > 0 {
@@ -404,6 +439,14 @@ func TestConfigMasters(t *testing.T) {
 						t.Errorf("machine workspace was enountered too few times[min: %d]", tc.minAllowedWorkspaceMatches)
 					}
 				}
+
+				if cpms != nil {
+					// Make sure FDs equal same quantity as config
+					fds := cpms.Spec.Template.OpenShiftMachineV1Beta1Machine.FailureDomains
+					if len(fds.VSphere) != len(tc.workspaces) {
+						t.Errorf("machine workspace count %d does not equal number of failure domains [count: %d] in CPMS", len(tc.workspaces), len(fds.VSphere))
+					}
+				}
 			}
 		})
 	}