Skipping affinity tests if fewer than three hosts.

Author: jweite-amazon

test/e2e/affinity_group.go

@@ -45,6 +45,14 @@ func AffinityGroupSpec(ctx context.Context, inputGetter func() CommonSpecInput)
 	BeforeEach(func() {
 		Expect(ctx).NotTo(BeNil(), "ctx is required for %s spec", specName)
 		input = inputGetter()
+
+		csClient := CreateCloudStackClient(ctx, input.BootstrapClusterProxy.GetKubeconfigPath())
+		zoneName := input.E2EConfig.GetVariable("CLOUDSTACK_ZONE_NAME")
+		numHosts := GetHostCount(csClient, zoneName)
+		if numHosts < 3 {
+			Skip("Too few ACS hosts to run conclusive affinity tests.  Please provision at least three for the zone.")
+		}
+
 		Expect(input.E2EConfig).ToNot(BeNil(), "Invalid argument. input.E2EConfig can't be nil when calling %s spec", specName)
 		Expect(input.ClusterctlConfigPath).To(BeAnExistingFile(), "Invalid argument. input.ClusterctlConfigPath must be an existing file when calling %s spec", specName)
 		Expect(input.BootstrapClusterProxy).ToNot(BeNil(), "Invalid argument. input.BootstrapClusterProxy can't be nil when calling %s spec", specName)
@@ -79,17 +87,6 @@ func AffinityGroupSpec(ctx context.Context, inputGetter func() CommonSpecInput)
 }
 
 func executeTest(ctx context.Context, input CommonSpecInput, namespace *corev1.Namespace, specName string, clusterResources *clusterctl.ApplyClusterTemplateAndWaitResult, affinityType string) []string {
-	csClient := CreateCloudStackClient(ctx, input.BootstrapClusterProxy.GetKubeconfigPath())
-	zoneName := input.E2EConfig.GetVariable("CLOUDSTACK_ZONE_NAME")
-	numHosts := GetHostCount(csClient, zoneName)
-	machineCount := int64(3) // Must allocate an odd number of CP machines w/ stacked etcd
-	if numHosts < 3 {
-		// If not enough ACS hosts to support 3 machines with anti-affinity, fall back to just allocating one machine.
-		//  Test will only confirm that the single VM is in an anti-affinity group, but not that ACS anti-affinty works.
-		By("Fewer than three host in ACS env.  Only verifying that a single VM gets placed in an AG, not that true affinity/anti-affinity is ultimately achieved.")
-		machineCount = int64(1)
-	}
-
 	clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
 		ClusterProxy:    input.BootstrapClusterProxy,
 		CNIManifestPath: input.E2EConfig.GetVariable(CNIPath),
@@ -102,13 +99,14 @@ func executeTest(ctx context.Context, input CommonSpecInput, namespace *corev1.N
 			Namespace:                namespace.Name,
 			ClusterName:              fmt.Sprintf("%s-%s", specName, util.RandomString(6)),
 			KubernetesVersion:        input.E2EConfig.GetVariable(KubernetesVersion),
-			ControlPlaneMachineCount: pointer.Int64Ptr(machineCount),
-			WorkerMachineCount:       pointer.Int64Ptr(machineCount),
+			ControlPlaneMachineCount: pointer.Int64Ptr(3),
+			WorkerMachineCount:       pointer.Int64Ptr(2),
 		},
 		WaitForClusterIntervals:      input.E2EConfig.GetIntervals(specName, "wait-cluster"),
 		WaitForControlPlaneIntervals: input.E2EConfig.GetIntervals(specName, "wait-control-plane"),
 		WaitForMachineDeployments:    input.E2EConfig.GetIntervals(specName, "wait-worker-nodes"),
 	}, clusterResources)
 
+	csClient := CreateCloudStackClient(ctx, input.BootstrapClusterProxy.GetKubeconfigPath())
 	return CheckAffinityGroup(csClient, clusterResources.Cluster.Name, affinityType)
 }