test/e2e: deprecate KCPUpgradeSpec, make ClusterUpgradeConformanceSpe…

…c more flexible

Signed-off-by: Stefan Büringer [email protected]

test/e2e/cluster_upgrade.go

@@ -41,6 +41,15 @@ type ClusterUpgradeConformanceSpecInput struct {
 	SkipCleanup           bool
 	SkipConformanceTests  bool
 
+	// ControlPlaneMachineCount is used in `config cluster` to configure the count of the control plane machines used in the test.
+	// Default is 1.
+	ControlPlaneMachineCount *int64
+	// WorkerMachineCount is used in `config cluster` to configure the count of the worker machines used in the test.
+	// NOTE: If the WORKER_MACHINE_COUNT var is used multiple times in the cluster template, the absolute count of
+	// worker machines is a multiple of WorkerMachineCount.
+	// Default is 2.
+	WorkerMachineCount *int64
+
 	// Flavor to use when creating the cluster for testing, "upgrades" is used if not specified.
 	Flavor *string
 }
@@ -57,9 +66,13 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust
 		specName                      = "k8s-upgrade-and-conformance"
 	)
 	var (
-		input                  ClusterUpgradeConformanceSpecInput
-		namespace              *corev1.Namespace
-		cancelWatches          context.CancelFunc
+		input         ClusterUpgradeConformanceSpecInput
+		namespace     *corev1.Namespace
+		cancelWatches context.CancelFunc
+
+		controlPlaneMachineCount int64
+		workerMachineCount       int64
+
 		clusterResources       *clusterctl.ApplyClusterTemplateAndWaitResult
 		kubetestConfigFilePath string
 	)
@@ -81,6 +94,18 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust
 		kubetestConfigFilePath = input.E2EConfig.GetVariable(kubetestConfigurationVariable)
 		Expect(kubetestConfigFilePath).To(BeAnExistingFile(), "%s should be a valid kubetest config file")
 
+		if input.ControlPlaneMachineCount == nil {
+			controlPlaneMachineCount = 1
+		} else {
+			controlPlaneMachineCount = *input.ControlPlaneMachineCount
+		}
+
+		if input.WorkerMachineCount == nil {
+			workerMachineCount = 2
+		} else {
+			workerMachineCount = *input.WorkerMachineCount
+		}
+
 		// Setup a Namespace where to host objects for this spec and create a watcher for the Namespace events.
 		namespace, cancelWatches = setupSpecNamespace(ctx, specName, input.BootstrapClusterProxy, input.ArtifactFolder)
 		clusterResources = new(clusterctl.ApplyClusterTemplateAndWaitResult)
@@ -89,11 +114,6 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust
 	It("Should create and upgrade a workload cluster and run kubetest", func() {
 		By("Creating a workload cluster")
 
-		var controlPlaneMachineCount int64 = 1
-		// clusterTemplateWorkerMachineCount is used for ConfigCluster, as it is used for MachineDeployments and
-		// MachinePools
-		var clusterTemplateWorkerMachineCount int64 = 2
-
 		clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
 			ClusterProxy: input.BootstrapClusterProxy,
 			ConfigCluster: clusterctl.ConfigClusterInput{
@@ -106,7 +126,7 @@ func ClusterUpgradeConformanceSpec(ctx context.Context, inputGetter func() Clust
 				ClusterName:              fmt.Sprintf("%s-%s", specName, util.RandomString(6)),
 				KubernetesVersion:        input.E2EConfig.GetVariable(KubernetesVersionUpgradeFrom),
 				ControlPlaneMachineCount: pointer.Int64Ptr(controlPlaneMachineCount),
-				WorkerMachineCount:       pointer.Int64Ptr(clusterTemplateWorkerMachineCount),
+				WorkerMachineCount:       pointer.Int64Ptr(workerMachineCount),
 			},
 			WaitForClusterIntervals:      input.E2EConfig.GetIntervals(specName, "wait-cluster"),
 			WaitForControlPlaneIntervals: input.E2EConfig.GetIntervals(specName, "wait-control-plane"),

test/e2e/cluster_upgrade_test.go

@@ -22,6 +22,7 @@ package e2e
 import (
 	. "github.com/onsi/ginkgo"
 	"k8s.io/utils/pointer"
+	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
 )
 
 var _ = Describe("When upgrading a workload cluster and testing K8S conformance [Conformance] [K8s-Upgrade]", func() {
@@ -51,3 +52,57 @@ var _ = Describe("When upgrading a workload cluster using ClusterClass", func()
 		}
 	})
 })
+
+var _ = Describe("When testing KCP upgrade in a single control plane cluster", func() {
+	ClusterUpgradeConformanceSpec(ctx, func() ClusterUpgradeConformanceSpecInput {
+		return ClusterUpgradeConformanceSpecInput{
+			E2EConfig:             e2eConfig,
+			ClusterctlConfigPath:  clusterctlConfigPath,
+			BootstrapClusterProxy: bootstrapClusterProxy,
+			ArtifactFolder:        artifactFolder,
+			SkipCleanup:           skipCleanup,
+			// This test is run in CI in parallel with other tests. To keep the test duration reasonable
+			// the conformance tests are skipped.
+			SkipConformanceTests:     true,
+			ControlPlaneMachineCount: pointer.Int64(1),
+			WorkerMachineCount:       pointer.Int64(1),
+			Flavor:                   pointer.String(clusterctl.DefaultFlavor),
+		}
+	})
+})
+
+var _ = Describe("When testing KCP upgrade in a HA cluster", func() {
+	ClusterUpgradeConformanceSpec(ctx, func() ClusterUpgradeConformanceSpecInput {
+		return ClusterUpgradeConformanceSpecInput{
+			E2EConfig:             e2eConfig,
+			ClusterctlConfigPath:  clusterctlConfigPath,
+			BootstrapClusterProxy: bootstrapClusterProxy,
+			ArtifactFolder:        artifactFolder,
+			SkipCleanup:           skipCleanup,
+			// This test is run in CI in parallel with other tests. To keep the test duration reasonable
+			// the conformance tests are skipped.
+			SkipConformanceTests:     true,
+			ControlPlaneMachineCount: pointer.Int64(3),
+			WorkerMachineCount:       pointer.Int64(1),
+			Flavor:                   pointer.String(clusterctl.DefaultFlavor),
+		}
+	})
+})
+
+var _ = Describe("When testing KCP upgrade in a HA cluster using scale in rollout", func() {
+	ClusterUpgradeConformanceSpec(ctx, func() ClusterUpgradeConformanceSpecInput {
+		return ClusterUpgradeConformanceSpecInput{
+			E2EConfig:             e2eConfig,
+			ClusterctlConfigPath:  clusterctlConfigPath,
+			BootstrapClusterProxy: bootstrapClusterProxy,
+			ArtifactFolder:        artifactFolder,
+			SkipCleanup:           skipCleanup,
+			// This test is run in CI in parallel with other tests. To keep the test duration reasonable
+			// the conformance tests are skipped.
+			SkipConformanceTests:     true,
+			ControlPlaneMachineCount: pointer.Int64(3),
+			WorkerMachineCount:       pointer.Int64(1),
+			Flavor:                   pointer.String("kcp-scale-in"),
+		}
+	})
+})

test/e2e/kcp_upgrade.go

@@ -32,6 +32,8 @@ import (
 )
 
 // KCPUpgradeSpecInput is the input for KCPUpgradeSpec.
+// Deprecated: This struct has been deprecated  and will be removed in a future release.
+// Please use ClusterUpgradeConformanceSpec and ClusterUpgradeConformanceSpecInput instead
 type KCPUpgradeSpecInput struct {
 	E2EConfig                *clusterctl.E2EConfig
 	ClusterctlConfigPath     string
@@ -43,6 +45,8 @@ type KCPUpgradeSpecInput struct {
 }
 
 // KCPUpgradeSpec implements a test that verifies KCP to properly upgrade a control plane.
+// Deprecated: This func has been deprecated  and will be removed in a future release.
+// Please use ClusterUpgradeConformanceSpec instead
 func KCPUpgradeSpec(ctx context.Context, inputGetter func() KCPUpgradeSpecInput) {
 	var (
 		specName         = "kcp-upgrade"