From 63be801b016d9f60ceb461c1a4ab6bc44a8141a0 Mon Sep 17 00:00:00 2001 From: Tanvir Tatla Date: Thu, 5 Oct 2023 15:09:41 -0700 Subject: [PATCH] add 1.23 cloudstack tests back --- test/e2e/cloudstack_test.go | 1124 ++++++++++++++++++++++++++++------- 1 file changed, 925 insertions(+), 199 deletions(-) diff --git a/test/e2e/cloudstack_test.go b/test/e2e/cloudstack_test.go index 26de665cff18..4dfb9a90d0d6 100644 --- a/test/e2e/cloudstack_test.go +++ b/test/e2e/cloudstack_test.go @@ -18,12 +18,12 @@ import ( ) // AWS IAM Auth -func TestCloudStackKubernetes128AWSIamAuth(t *testing.T) { +func TestCloudStackKubernetes123AWSIamAuth(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), framework.WithAWSIam(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), ) runAWSIamAuthFlow(test) } @@ -68,20 +68,30 @@ func TestCloudStackKubernetes127AWSIamAuth(t *testing.T) { runAWSIamAuthFlow(test) } -// TODO: Add TestCloudStackKubernetes127to128AWSIamAuthUpgrade -func TestCloudStackKubernetes127to128AWSIamAuthUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) +func TestCloudStackKubernetes128AWSIamAuth(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.WithAWSIam(), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + ) + runAWSIamAuthFlow(test) +} + +// TODO: Add TestCloudStackKubernetes123to124AWSIamAuthUpgrade +func TestCloudStackKubernetes123to124AWSIamAuthUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) test := framework.NewClusterE2ETest( t, provider, framework.WithAWSIam(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), ) runUpgradeFlowWithAWSIamAuth( test, - v1alpha1.Kube128, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), - provider.WithProviderUpgrade(provider.Redhat128Template()), + v1alpha1.Kube124, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube124)), + provider.WithProviderUpgrade(provider.Redhat124Template()), ) } @@ -133,14 +143,30 @@ func TestCloudStackKubernetes126to127AWSIamAuthUpgrade(t *testing.T) { ) } +func TestCloudStackKubernetes127to128AWSIamAuthUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithAWSIam(), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + ) + runUpgradeFlowWithAWSIamAuth( + test, + v1alpha1.Kube128, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), + provider.WithProviderUpgrade(provider.Redhat128Template()), + ) +} + // Curated packages test -func TestCloudStackKubernetes128RedhatCuratedPackagesSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes123RedhatCuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123), "my-packages-test", EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) @@ -199,7 +225,7 @@ func TestCloudStackKubernetes127RedhatCuratedPackagesSimpleFlow(t *testing.T) { runCuratedPackageInstallSimpleFlow(test) } -func TestCloudStackKubernetes128RedhatCuratedPackagesEmissarySimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128RedhatCuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest( t, @@ -209,6 +235,19 @@ func TestCloudStackKubernetes128RedhatCuratedPackagesEmissarySimpleFlow(t *testi "my-packages-test", EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) + runCuratedPackageInstallSimpleFlow(test) +} + +func TestCloudStackKubernetes123RedhatCuratedPackagesEmissarySimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123), + "my-packages-test", EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) runCuratedPackageEmissaryInstallSimpleFlow(test) } @@ -264,7 +303,7 @@ func TestCloudStackKubernetes127RedhatCuratedPackagesEmissarySimpleFlow(t *testi runCuratedPackageEmissaryInstallSimpleFlow(test) } -func TestCloudStackKubernetes128RedhatCuratedPackagesHarborSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128RedhatCuratedPackagesEmissarySimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest( t, @@ -274,6 +313,19 @@ func TestCloudStackKubernetes128RedhatCuratedPackagesHarborSimpleFlow(t *testing "my-packages-test", EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) + runCuratedPackageEmissaryInstallSimpleFlow(test) +} + +func TestCloudStackKubernetes123RedhatCuratedPackagesHarborSimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123), + "my-packages-test", EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) } @@ -329,10 +381,23 @@ func TestCloudStackKubernetes127RedhatCuratedPackagesHarborSimpleFlow(t *testing runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) } -func TestCloudStackKubernetes128RedhatWorkloadClusterCuratedPackagesSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128RedhatCuratedPackagesHarborSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) - test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube128) + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + "my-packages-test", EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) + runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) +} + +func TestCloudStackKubernetes123RedhatWorkloadClusterCuratedPackagesSimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube123) runCuratedPackageRemoteClusterInstallSimpleFlow(test) } @@ -364,10 +429,17 @@ func TestCloudStackKubernetes127RedhatWorkloadClusterCuratedPackagesSimpleFlow(t runCuratedPackageRemoteClusterInstallSimpleFlow(test) } -func TestCloudStackKubernetes128RedhatWorkloadClusterCuratedPackagesEmissarySimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128RedhatWorkloadClusterCuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube128) + runCuratedPackageRemoteClusterInstallSimpleFlow(test) +} + +func TestCloudStackKubernetes123RedhatWorkloadClusterCuratedPackagesEmissarySimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube123) runCuratedPackageEmissaryRemoteClusterInstallSimpleFlow(test) } @@ -399,11 +471,18 @@ func TestCloudStackKubernetes127RedhatWorkloadClusterCuratedPackagesEmissarySimp runCuratedPackageEmissaryRemoteClusterInstallSimpleFlow(test) } -func TestCloudStackKubernetes128RedhatCuratedPackagesCertManagerSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128RedhatWorkloadClusterCuratedPackagesEmissarySimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) - framework.CheckCertManagerCredentials(t) provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube128) + runCuratedPackageEmissaryRemoteClusterInstallSimpleFlow(test) +} + +func TestCloudStackKubernetes123RedhatCuratedPackagesCertManagerSimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + framework.CheckCertManagerCredentials(t) + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube123) runCertManagerRemoteClusterInstallSimpleFlow(test) } @@ -439,12 +518,20 @@ func TestCloudStackKubernetes127RedhatCuratedPackagesCertManagerSimpleFlow(t *te runCertManagerRemoteClusterInstallSimpleFlow(test) } -func TestCloudStackKubernetes128RedhatCuratedPackagesAdotSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128RedhatCuratedPackagesCertManagerSimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + framework.CheckCertManagerCredentials(t) + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) + test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube128) + runCertManagerRemoteClusterInstallSimpleFlow(test) +} + +func TestCloudStackKubernetes123RedhatCuratedPackagesAdotSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123), "my-packages-test", EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) @@ -499,7 +586,7 @@ func TestCloudStackKubernetes127RedhatCuratedPackagesAdotSimpleFlow(t *testing.T runCuratedPackagesAdotInstallSimpleFlow(test) } -func TestCloudStackKubernetes128RedhatCuratedPackagesAdotUpdateFlow(t *testing.T) { +func TestCloudStackKubernetes128RedhatCuratedPackagesAdotSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), @@ -508,6 +595,18 @@ func TestCloudStackKubernetes128RedhatCuratedPackagesAdotUpdateFlow(t *testing.T "my-packages-test", EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) + runCuratedPackagesAdotInstallSimpleFlow(test) +} + +func TestCloudStackKubernetes123RedhatCuratedPackagesAdotUpdateFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123), + "my-packages-test", EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) runCuratedPackagesAdotInstallUpdateFlow(test) } @@ -559,15 +658,27 @@ func TestCloudStackKubernetes127RedhatCuratedPackagesAdotUpdateFlow(t *testing.T runCuratedPackagesAdotInstallUpdateFlow(test) } -func TestCloudStackKubernetes128RedHatCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128RedhatCuratedPackagesAdotUpdateFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + "my-packages-test", EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) + runCuratedPackagesAdotInstallUpdateFlow(test) +} + +func TestCloudStackKubernetes123RedHatCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { minNodes := 1 maxNodes := 2 framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) @@ -634,12 +745,27 @@ func TestCloudStackKubernetes127RedHatCuratedPackagesClusterAutoscalerSimpleFlow runAutoscalerWithMetricsServerSimpleFlow(test) } -func TestCloudStackKubernetes128RedhatCuratedPackagesPrometheusSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128RedHatCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { + minNodes := 1 + maxNodes := 2 framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, + test := framework.NewClusterE2ETest( + t, framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) + runAutoscalerWithMetricsServerSimpleFlow(test) +} + +func TestCloudStackKubernetes123RedhatCuratedPackagesPrometheusSimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube123), "my-packages-test", EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) @@ -694,25 +820,37 @@ func TestCloudStackKubernetes127RedhatCuratedPackagesPrometheusSimpleFlow(t *tes runCuratedPackagesPrometheusInstallSimpleFlow(test) } +func TestCloudStackKubernetes128RedhatCuratedPackagesPrometheusSimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + "my-packages-test", EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) + runCuratedPackagesPrometheusInstallSimpleFlow(test) +} + // Download artifacts func TestCloudStackDownloadArtifacts(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), ) runDownloadArtifactsFlow(test) } // Flux -func TestCloudStackKubernetes128GithubFlux(t *testing.T) { +func TestCloudStackKubernetes123GithubFlux(t *testing.T) { test := framework.NewClusterE2ETest(t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), framework.WithFluxGithub(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), @@ -768,10 +906,10 @@ func TestCloudStackKubernetes127GithubFlux(t *testing.T) { runFluxFlow(test) } -func TestCloudStackKubernetes128GitFlux(t *testing.T) { +func TestCloudStackKubernetes128GithubFlux(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), - framework.WithFluxGit(), + framework.WithFluxGithub(), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), @@ -780,6 +918,18 @@ func TestCloudStackKubernetes128GitFlux(t *testing.T) { runFluxFlow(test) } +func TestCloudStackKubernetes123GitFlux(t *testing.T) { + test := framework.NewClusterE2ETest(t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithFluxGit(), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + ) + runFluxFlow(test) +} + func TestCloudStackKubernetes124GitFlux(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), @@ -828,22 +978,34 @@ func TestCloudStackKubernetes127GitFlux(t *testing.T) { runFluxFlow(test) } +func TestCloudStackKubernetes128GitFlux(t *testing.T) { + test := framework.NewClusterE2ETest(t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.WithFluxGit(), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + ) + runFluxFlow(test) +} + // TODO: Add 1.23 to 1.24 flux upgrade tests -func TestCloudStackKubernetes127To128GitFluxUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) +func TestCloudStackKubernetes123To124GitFluxUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) test := framework.NewClusterE2ETest(t, provider, framework.WithFluxGit(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), ) runUpgradeFlowWithFlux( test, - v1alpha1.Kube128, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), - provider.WithProviderUpgrade(provider.Redhat128Template()), + v1alpha1.Kube124, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube124)), + provider.WithProviderUpgrade(provider.Redhat124Template()), ) } @@ -901,11 +1063,12 @@ func TestCloudStackKubernetes126To127GitFluxUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes128InstallGitFluxDuringUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) +func TestCloudStackKubernetes127To128GitFluxUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) test := framework.NewClusterE2ETest(t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithFluxGit(), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), @@ -913,6 +1076,23 @@ func TestCloudStackKubernetes128InstallGitFluxDuringUpgrade(t *testing.T) { runUpgradeFlowWithFlux( test, v1alpha1.Kube128, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), + provider.WithProviderUpgrade(provider.Redhat128Template()), + ) +} + +func TestCloudStackKubernetes123InstallGitFluxDuringUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := framework.NewClusterE2ETest(t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + ) + runUpgradeFlowWithFlux( + test, + v1alpha1.Kube123, framework.WithFluxGit(), framework.WithClusterUpgrade(api.WithGitOpsRef(framework.DefaultFluxConfigName, v1alpha1.FluxConfigKind)), ) @@ -986,15 +1166,32 @@ func TestCloudStackKubernetes127InstallGitFluxDuringUpgrade(t *testing.T) { ) } +func TestCloudStackKubernetes128InstallGitFluxDuringUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) + test := framework.NewClusterE2ETest(t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + ) + runUpgradeFlowWithFlux( + test, + v1alpha1.Kube128, + framework.WithFluxGit(), + framework.WithClusterUpgrade(api.WithGitOpsRef(framework.DefaultFluxConfigName, v1alpha1.FluxConfigKind)), + ) +} + // Labels -func TestCloudStackKubernetes128LabelsAndNodeNameRedhat(t *testing.T) { +func TestCloudStackKubernetes123LabelsAndNodeNameRedhat(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewCloudStack(t, - framework.WithCloudStackRedhat128(), + framework.WithCloudStackRedhat123(), ), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube123), api.WithControlPlaneLabel(constants.FailureDomainLabelName, constants.CloudstackFailureDomainPlaceholder), api.WithWorkerNodeGroup(constants.DefaultWorkerNodeGroupName, api.WithCount(1), @@ -1097,14 +1294,36 @@ func TestCloudStackKubernetes127LabelsAndNodeNameRedhat(t *testing.T) { test.DeleteCluster() } -func TestCloudStackKubernetes128RedhatLabelsUpgradeFlow(t *testing.T) { - provider := redhat128ProviderWithLabels(t) +func TestCloudStackKubernetes128LabelsAndNodeNameRedhat(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, + framework.WithCloudStackRedhat128(), + ), + framework.WithClusterFiller( + api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithControlPlaneLabel(constants.FailureDomainLabelName, constants.CloudstackFailureDomainPlaceholder), + api.WithWorkerNodeGroup(constants.DefaultWorkerNodeGroupName, + api.WithCount(1), + api.WithLabel(constants.FailureDomainLabelName, constants.CloudstackFailureDomainPlaceholder), + ), + ), + ) + test.GenerateClusterConfig() + test.CreateCluster() + test.ValidateControlPlaneNodes(framework.ValidateControlPlaneFailureDomainLabels, framework.ValidateControlPlaneNodeNameMatchCAPIMachineName) + test.ValidateWorkerNodes(framework.ValidateWorkerNodeFailureDomainLabels, framework.ValidateWorkerNodeNameMatchCAPIMachineName) + test.DeleteCluster() +} + +func TestCloudStackKubernetes123RedhatLabelsUpgradeFlow(t *testing.T) { + provider := redhat123ProviderWithLabels(t) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube123), api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -1113,7 +1332,7 @@ func TestCloudStackKubernetes128RedhatLabelsUpgradeFlow(t *testing.T) { runLabelsUpgradeFlow( test, - v1alpha1.Kube128, + v1alpha1.Kube123, framework.WithClusterUpgrade( api.WithWorkerNodeGroup(worker0, api.WithLabel(key1, val1)), api.WithWorkerNodeGroup(worker1, api.WithLabel(key2, val2)), @@ -1227,7 +1446,33 @@ func TestCloudStackKubernetes127RedhatLabelsUpgradeFlow(t *testing.T) { ) } -func redhat128ProviderWithLabels(t *testing.T) *framework.CloudStack { +func TestCloudStackKubernetes128RedhatLabelsUpgradeFlow(t *testing.T) { + provider := redhat128ProviderWithLabels(t) + + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller( + api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithExternalEtcdTopology(1), + api.WithControlPlaneCount(1), + api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate + ), + ) + + runLabelsUpgradeFlow( + test, + v1alpha1.Kube128, + framework.WithClusterUpgrade( + api.WithWorkerNodeGroup(worker0, api.WithLabel(key1, val1)), + api.WithWorkerNodeGroup(worker1, api.WithLabel(key2, val2)), + api.WithWorkerNodeGroup(worker2), + api.WithControlPlaneLabel(cpKey1, cpVal1), + ), + ) +} + +func redhat123ProviderWithLabels(t *testing.T) *framework.CloudStack { return framework.NewCloudStack(t, framework.WithCloudStackWorkerNodeGroup( worker0, @@ -1243,7 +1488,7 @@ func redhat128ProviderWithLabels(t *testing.T) *framework.CloudStack { framework.WithWorkerNodeGroup(worker2, api.WithCount(1), api.WithLabel(key2, val2)), ), - framework.WithCloudStackRedhat128(), + framework.WithCloudStackRedhat123(), ) } @@ -1327,16 +1572,36 @@ func redhat127ProviderWithLabels(t *testing.T) *framework.CloudStack { ) } +func redhat128ProviderWithLabels(t *testing.T) *framework.CloudStack { + return framework.NewCloudStack(t, + framework.WithCloudStackWorkerNodeGroup( + worker0, + framework.WithWorkerNodeGroup(worker0, api.WithCount(2), + api.WithLabel(key1, val2)), + ), + framework.WithCloudStackWorkerNodeGroup( + worker1, + framework.WithWorkerNodeGroup(worker1, api.WithCount(1)), + ), + framework.WithCloudStackWorkerNodeGroup( + worker2, + framework.WithWorkerNodeGroup(worker2, api.WithCount(1), + api.WithLabel(key2, val2)), + ), + framework.WithCloudStackRedhat128(), + ) +} + // Multicluster -func TestCloudStackKubernetes128MulticlusterWorkloadCluster(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) +func TestCloudStackKubernetes123MulticlusterWorkloadCluster(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) test := framework.NewMulticlusterE2ETest( t, framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube123), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), @@ -1346,7 +1611,7 @@ func TestCloudStackKubernetes128MulticlusterWorkloadCluster(t *testing.T) { t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube123), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), @@ -1468,9 +1733,7 @@ func TestCloudStackKubernetes127MulticlusterWorkloadCluster(t *testing.T) { runWorkloadClusterFlow(test) } -// WL cluster with prev release version from management cluster -func TestCloudStackKubernetes128MulticlusterWorkloadClusterPrevVersion(t *testing.T) { - prevLatestRel := prevLatestMinorRelease(t) +func TestCloudStackKubernetes128MulticlusterWorkloadCluster(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) test := framework.NewMulticlusterE2ETest( t, @@ -1495,12 +1758,42 @@ func TestCloudStackKubernetes128MulticlusterWorkloadClusterPrevVersion(t *testin ), ), ) + runWorkloadClusterFlow(test) +} + +// WL cluster with prev release version from management cluster +func TestCloudStackKubernetes123MulticlusterWorkloadClusterPrevVersion(t *testing.T) { + prevLatestRel := prevLatestMinorRelease(t) + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := framework.NewMulticlusterE2ETest( + t, + framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller( + api.WithKubernetesVersion(v1alpha1.Kube123), + api.WithControlPlaneCount(1), + api.WithWorkerNodeCount(1), + api.WithStackedEtcdTopology(), + ), + ), + framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller( + api.WithKubernetesVersion(v1alpha1.Kube123), + api.WithControlPlaneCount(1), + api.WithWorkerNodeCount(1), + api.WithStackedEtcdTopology(), + ), + ), + ) runWorkloadClusterPrevVersionCreateFlow(test, prevLatestRel) } // TODO: Add TestCloudStackUpgradeKubernetes124MulticlusterWorkloadClusterWithGithubFlux func TestCloudStackUpgradeKubernetes124MulticlusterWorkloadClusterWithGithubFlux(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) test := framework.NewMulticlusterE2ETest( t, framework.NewClusterE2ETest( @@ -1508,7 +1801,7 @@ func TestCloudStackUpgradeKubernetes124MulticlusterWorkloadClusterWithGithubFlux provider, framework.WithFluxGithub(), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube123), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), @@ -1519,7 +1812,7 @@ func TestCloudStackUpgradeKubernetes124MulticlusterWorkloadClusterWithGithubFlux provider, framework.WithFluxGithub(), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube123), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), @@ -1574,13 +1867,53 @@ func TestCloudStackUpgradeKubernetes125MulticlusterWorkloadClusterWithGithubFlux api.WithWorkerNodeCount(3), ), provider.WithProviderUpgradeGit( - provider.Redhat125Template(), + provider.Redhat125Template(), + ), + ) +} + +func TestCloudStackUpgradeKubernetes126MulticlusterWorkloadClusterWithGithubFlux(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) + test := framework.NewMulticlusterE2ETest( + t, + framework.NewClusterE2ETest( + t, + provider, + framework.WithFluxGithub(), + framework.WithClusterFiller( + api.WithKubernetesVersion(v1alpha1.Kube125), + api.WithControlPlaneCount(1), + api.WithWorkerNodeCount(1), + api.WithStackedEtcdTopology(), + ), + ), + framework.NewClusterE2ETest( + t, + provider, + framework.WithFluxGithub(), + framework.WithClusterFiller( + api.WithKubernetesVersion(v1alpha1.Kube125), + api.WithControlPlaneCount(1), + api.WithWorkerNodeCount(1), + api.WithStackedEtcdTopology(), + ), + ), + ) + runWorkloadClusterFlowWithGitOps( + test, + framework.WithClusterUpgradeGit( + api.WithKubernetesVersion(v1alpha1.Kube126), + api.WithControlPlaneCount(3), + api.WithWorkerNodeCount(3), + ), + provider.WithProviderUpgradeGit( + provider.Redhat126Template(), ), ) } -func TestCloudStackUpgradeKubernetes126MulticlusterWorkloadClusterWithGithubFlux(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) +func TestCloudStackUpgradeKubernetes127MulticlusterWorkloadClusterWithGithubFlux(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat126()) test := framework.NewMulticlusterE2ETest( t, framework.NewClusterE2ETest( @@ -1588,7 +1921,7 @@ func TestCloudStackUpgradeKubernetes126MulticlusterWorkloadClusterWithGithubFlux provider, framework.WithFluxGithub(), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube125), + api.WithKubernetesVersion(v1alpha1.Kube126), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), @@ -1599,7 +1932,7 @@ func TestCloudStackUpgradeKubernetes126MulticlusterWorkloadClusterWithGithubFlux provider, framework.WithFluxGithub(), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube125), + api.WithKubernetesVersion(v1alpha1.Kube126), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), @@ -1609,17 +1942,17 @@ func TestCloudStackUpgradeKubernetes126MulticlusterWorkloadClusterWithGithubFlux runWorkloadClusterFlowWithGitOps( test, framework.WithClusterUpgradeGit( - api.WithKubernetesVersion(v1alpha1.Kube126), + api.WithKubernetesVersion(v1alpha1.Kube127), api.WithControlPlaneCount(3), api.WithWorkerNodeCount(3), ), provider.WithProviderUpgradeGit( - provider.Redhat126Template(), + provider.Redhat127Template(), ), ) } -func TestCloudStackUpgradeKubernetes127MulticlusterWorkloadClusterWithGithubFlux(t *testing.T) { +func TestCloudStackUpgradeKubernetes128MulticlusterWorkloadClusterWithGithubFlux(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat126()) test := framework.NewMulticlusterE2ETest( t, @@ -1649,19 +1982,19 @@ func TestCloudStackUpgradeKubernetes127MulticlusterWorkloadClusterWithGithubFlux runWorkloadClusterFlowWithGitOps( test, framework.WithClusterUpgradeGit( - api.WithKubernetesVersion(v1alpha1.Kube127), + api.WithKubernetesVersion(v1alpha1.Kube128), api.WithControlPlaneCount(3), api.WithWorkerNodeCount(3), ), provider.WithProviderUpgradeGit( - provider.Redhat127Template(), + provider.Redhat128Template(), ), ) } -func TestCloudStackKubernetes128WithOIDCManagementClusterUpgradeFromLatestSideEffects(t *testing.T) { +func TestCloudStackKubernetes123WithOIDCManagementClusterUpgradeFromLatestSideEffects(t *testing.T) { cloudstack := framework.NewCloudStack(t) - runTestManagementClusterUpgradeSideEffects(t, cloudstack, framework.RedHat8, anywherev1.Kube128) + runTestManagementClusterUpgradeSideEffects(t, cloudstack, framework.RedHat8, anywherev1.Kube123) } func TestCloudStackKubernetes124WithOIDCManagementClusterUpgradeFromLatestSideEffects(t *testing.T) { @@ -1684,13 +2017,18 @@ func TestCloudStackKubernetes127WithOIDCManagementClusterUpgradeFromLatestSideEf runTestManagementClusterUpgradeSideEffects(t, cloudstack, framework.RedHat8, anywherev1.Kube127) } +func TestCloudStackKubernetes128WithOIDCManagementClusterUpgradeFromLatestSideEffects(t *testing.T) { + cloudstack := framework.NewCloudStack(t) + runTestManagementClusterUpgradeSideEffects(t, cloudstack, framework.RedHat8, anywherev1.Kube128) +} + // OIDC -func TestCloudStackKubernetes128OIDC(t *testing.T) { +func TestCloudStackKubernetes123OIDC(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), framework.WithOIDC(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), @@ -1750,23 +2088,36 @@ func TestCloudStackKubernetes127OIDC(t *testing.T) { runOIDCFlow(test) } -// TODO: Add TestCloudStackKubernetes128To124OIDCUpgrade -func TestCloudStackKubernetes127To128OIDCUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) +func TestCloudStackKubernetes128OIDC(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.WithOIDC(), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + ) + runOIDCFlow(test) +} + +// TODO: Add TestCloudStackKubernetes123To124OIDCUpgrade +func TestCloudStackKubernetes123To124OIDCUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) test := framework.NewClusterE2ETest( t, provider, framework.WithOIDC(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), ) runUpgradeFlowWithOIDC( test, - v1alpha1.Kube128, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), - provider.WithProviderUpgrade(provider.Redhat128Template()), + v1alpha1.Kube124, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube124)), + provider.WithProviderUpgrade(provider.Redhat124Template()), ) } @@ -1828,14 +2179,14 @@ func TestCloudStackKubernetes126To127OIDCUpgrade(t *testing.T) { } // Proxy config -func TestCloudStackKubernetes128RedhatProxyConfig(t *testing.T) { +func TestCloudStackKubernetes123RedhatProxyConfig(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithProxy(framework.CloudstackProxyRequiredEnvVars), ) runProxyConfigFlow(test) @@ -1893,8 +2244,21 @@ func TestCloudStackKubernetes127RedhatProxyConfig(t *testing.T) { runProxyConfigFlow(test) } +func TestCloudStackKubernetes128RedhatProxyConfig(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithProxy(framework.CloudstackProxyRequiredEnvVars), + ) + runProxyConfigFlow(test) +} + // Proxy config multicluster -func TestCloudStackKubernetes128RedhatProxyConfigAPI(t *testing.T) { +func TestCloudStackKubernetes123RedhatProxyConfigAPI(t *testing.T) { cloudstack := framework.NewCloudStack(t) managementCluster := framework.NewClusterE2ETest( t, @@ -1904,7 +2268,7 @@ func TestCloudStackKubernetes128RedhatProxyConfigAPI(t *testing.T) { api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), ) test := framework.NewMulticlusterE2ETest(t, managementCluster) @@ -1918,7 +2282,7 @@ func TestCloudStackKubernetes128RedhatProxyConfigAPI(t *testing.T) { api.ClusterToConfigFiller( api.WithManagementCluster(managementCluster.ClusterName), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), ), ) @@ -2114,15 +2478,59 @@ func TestCloudStackKubernetes127RedhatProxyConfigAPI(t *testing.T) { test.DeleteManagementCluster() } +func TestCloudStackKubernetes128RedhatProxyConfigAPI(t *testing.T) { + cloudstack := framework.NewCloudStack(t) + managementCluster := framework.NewClusterE2ETest( + t, + cloudstack, + ).WithClusterConfig( + api.ClusterToConfigFiller( + api.WithControlPlaneCount(1), + api.WithWorkerNodeCount(1), + ), + cloudstack.WithRedhat128(), + ) + + test := framework.NewMulticlusterE2ETest(t, managementCluster) + test.WithWorkloadClusters( + framework.NewClusterE2ETest( + t, + cloudstack, + framework.WithClusterName(test.NewWorkloadClusterName()), + framework.WithProxy(framework.CloudstackProxyRequiredEnvVars), + ).WithClusterConfig( + api.ClusterToConfigFiller( + api.WithManagementCluster(managementCluster.ClusterName), + ), + cloudstack.WithRedhat128(), + ), + ) + + test.CreateManagementCluster() + + // Create workload clusters + test.RunConcurrentlyInWorkloadClusters(func(wc *framework.WorkloadCluster) { + wc.ApplyClusterManifest() + wc.WaitForKubeconfig() + wc.ValidateClusterState() + + wc.DeleteClusterWithKubectl() + wc.ValidateClusterDelete() + }) + + test.ManagementCluster.StopIfFailed() + test.DeleteManagementCluster() +} + // Registry mirror -func TestCloudStackKubernetes128RedhatRegistryMirrorInsecureSkipVerify(t *testing.T) { +func TestCloudStackKubernetes123RedhatRegistryMirrorInsecureSkipVerify(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithRegistryMirrorInsecureSkipVerify(constants.CloudStackProviderName), ) runRegistryMirrorConfigFlow(test) @@ -2180,7 +2588,7 @@ func TestCloudStackKubernetes127RedhatRegistryMirrorInsecureSkipVerify(t *testin runRegistryMirrorConfigFlow(test) } -func TestCloudStackKubernetes128RedhatRegistryMirrorAndCert(t *testing.T) { +func TestCloudStackKubernetes128RedhatRegistryMirrorInsecureSkipVerify(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), @@ -2188,6 +2596,19 @@ func TestCloudStackKubernetes128RedhatRegistryMirrorAndCert(t *testing.T) { framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithRegistryMirrorInsecureSkipVerify(constants.CloudStackProviderName), + ) + runRegistryMirrorConfigFlow(test) +} + +func TestCloudStackKubernetes123RedhatRegistryMirrorAndCert(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithRegistryMirrorEndpointAndCert(constants.CloudStackProviderName), ) runRegistryMirrorConfigFlow(test) @@ -2245,7 +2666,7 @@ func TestCloudStackKubernetes127RedhatRegistryMirrorAndCert(t *testing.T) { runRegistryMirrorConfigFlow(test) } -func TestCloudStackKubernetes128RedhatAuthenticatedRegistryMirror(t *testing.T) { +func TestCloudStackKubernetes128RedhatRegistryMirrorAndCert(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), @@ -2253,6 +2674,19 @@ func TestCloudStackKubernetes128RedhatAuthenticatedRegistryMirror(t *testing.T) framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithRegistryMirrorEndpointAndCert(constants.CloudStackProviderName), + ) + runRegistryMirrorConfigFlow(test) +} + +func TestCloudStackKubernetes123RedhatAuthenticatedRegistryMirror(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithAuthenticatedRegistryMirror(constants.CloudStackProviderName), ) runRegistryMirrorConfigFlow(test) @@ -2310,7 +2744,29 @@ func TestCloudStackKubernetes127RedhatAuthenticatedRegistryMirror(t *testing.T) runRegistryMirrorConfigFlow(test) } +func TestCloudStackKubernetes128RedhatAuthenticatedRegistryMirror(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithAuthenticatedRegistryMirror(constants.CloudStackProviderName), + ) + runRegistryMirrorConfigFlow(test) +} + // Simpleflow +func TestCloudStackKubernetes123SimpleFlow(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + ) + runSimpleFlow(test) +} + func TestCloudStackKubernetes124SimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -2356,11 +2812,11 @@ func TestCloudStackKubernetes128SimpleFlow(t *testing.T) { runSimpleFlow(test) } -func TestCloudStackKubernetes128ThreeReplicasFiveWorkersSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes123ThreeReplicasFiveWorkersSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(3)), framework.WithClusterFiller(api.WithWorkerNodeCount(5)), ) @@ -2411,12 +2867,23 @@ func TestCloudStackKubernetes127ThreeReplicasFiveWorkersSimpleFlow(t *testing.T) runSimpleFlow(test) } -func TestCloudStackKubernetes128MultiEndpointSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128ThreeReplicasFiveWorkersSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128(), - framework.WithCloudStackFillers(framework.UpdateAddCloudStackAz2())), + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithControlPlaneCount(3)), + framework.WithClusterFiller(api.WithWorkerNodeCount(5)), + ) + runSimpleFlow(test) +} + +func TestCloudStackKubernetes123MultiEndpointSimpleFlow(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123(), + framework.WithCloudStackFillers(framework.UpdateAddCloudStackAz2())), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), ) runSimpleFlow(test) } @@ -2461,13 +2928,23 @@ func TestCloudStackKubernetes127MultiEndpointSimpleFlow(t *testing.T) { runSimpleFlow(test) } -func TestCloudStackKubernetes128DifferentNamespaceSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128MultiEndpointSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewCloudStack(t, framework.WithCloudStackRedhat128(), + framework.WithCloudStackFillers(framework.UpdateAddCloudStackAz2())), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + ) + runSimpleFlow(test) +} + +func TestCloudStackKubernetes123DifferentNamespaceSimpleFlow(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123(), framework.WithCloudStackFillers(api.WithCloudStackConfigNamespace(clusterNamespace), api.WithCloudStackConfigNamespaceForAllMachinesAndDatacenter(clusterNamespace))), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithClusterNamespace(clusterNamespace)), ) runSimpleFlow(test) @@ -2521,12 +2998,24 @@ func TestCloudStackKubernetes127DifferentNamespaceSimpleFlow(t *testing.T) { runSimpleFlow(test) } -// Cilium Policy -func TestCloudStackKubernetes128CiliumAlwaysPolicyEnforcementModeSimpleFlow(t *testing.T) { +func TestCloudStackKubernetes128DifferentNamespaceSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.NewCloudStack(t, framework.WithCloudStackRedhat128(), + framework.WithCloudStackFillers(api.WithCloudStackConfigNamespace(clusterNamespace), + api.WithCloudStackConfigNamespaceForAllMachinesAndDatacenter(clusterNamespace))), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithClusterNamespace(clusterNamespace)), + ) + runSimpleFlow(test) +} + +// Cilium Policy +func TestCloudStackKubernetes123CiliumAlwaysPolicyEnforcementModeSimpleFlow(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways)), ) runSimpleFlow(test) @@ -2572,13 +3061,23 @@ func TestCloudStackKubernetes127CiliumAlwaysPolicyEnforcementModeSimpleFlow(t *t runSimpleFlow(test) } -// TODO: Add TestCloudStackKubernetes128RedhatTo124UpgradeCiliumPolicyEnforcementMode -func TestCloudStackKubernetes128RedhatTo124UpgradeCiliumPolicyEnforcementMode(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) +func TestCloudStackKubernetes128CiliumAlwaysPolicyEnforcementModeSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - provider, + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways)), + ) + runSimpleFlow(test) +} + +// TODO: Add TestCloudStackKubernetes123RedhatTo124UpgradeCiliumPolicyEnforcementMode +func TestCloudStackKubernetes123RedhatTo124UpgradeCiliumPolicyEnforcementMode(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), @@ -2650,10 +3149,10 @@ func TestCloudStackKubernetes126RedhatTo127UpgradeCiliumPolicyEnforcementMode(t } // Stacked etcd -func TestCloudStackKubernetes128StackedEtcdRedhat(t *testing.T) { +func TestCloudStackKubernetes123StackedEtcdRedhat(t *testing.T) { test := framework.NewClusterE2ETest(t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.NewCloudStack(t, framework.WithCloudStackRedhat123()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithStackedEtcdTopology())) runStackedEtcdFlow(test) @@ -2695,15 +3194,24 @@ func TestCloudStackKubernetes127StackedEtcdRedhat(t *testing.T) { runStackedEtcdFlow(test) } +func TestCloudStackKubernetes128StackedEtcdRedhat(t *testing.T) { + test := framework.NewClusterE2ETest(t, + framework.NewCloudStack(t, framework.WithCloudStackRedhat128()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithStackedEtcdTopology())) + runStackedEtcdFlow(test) +} + // Taints -func TestCloudStackKubernetes128RedhatTaintsUpgradeFlow(t *testing.T) { - provider := redhat128ProviderWithTaints(t) +func TestCloudStackKubernetes123RedhatTaintsUpgradeFlow(t *testing.T) { + provider := redhat123ProviderWithTaints(t) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube123), api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -2712,7 +3220,7 @@ func TestCloudStackKubernetes128RedhatTaintsUpgradeFlow(t *testing.T) { runTaintsUpgradeFlow( test, - v1alpha1.Kube128, + v1alpha1.Kube123, framework.WithClusterUpgrade( api.WithWorkerNodeGroup(worker0, api.WithTaint(framework.NoExecuteTaint())), api.WithWorkerNodeGroup(worker1, api.WithTaint(framework.NoExecuteTaint())), @@ -2764,7 +3272,33 @@ func TestCloudStackKubernetes125RedhatTaintsUpgradeFlow(t *testing.T) { runTaintsUpgradeFlow( test, - v1alpha1.Kube125, + v1alpha1.Kube125, + framework.WithClusterUpgrade( + api.WithWorkerNodeGroup(worker0, api.WithTaint(framework.NoExecuteTaint())), + api.WithWorkerNodeGroup(worker1, api.WithTaint(framework.NoExecuteTaint())), + api.WithWorkerNodeGroup(worker2, api.WithNoTaints()), + api.WithControlPlaneTaints([]corev1.Taint{framework.PreferNoScheduleTaint()}), + ), + ) +} + +func TestCloudStackKubernetes126RedhatTaintsUpgradeFlow(t *testing.T) { + provider := redhat126ProviderWithTaints(t) + + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller( + api.WithKubernetesVersion(v1alpha1.Kube126), + api.WithExternalEtcdTopology(1), + api.WithControlPlaneCount(1), + api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate + ), + ) + + runTaintsUpgradeFlow( + test, + v1alpha1.Kube126, framework.WithClusterUpgrade( api.WithWorkerNodeGroup(worker0, api.WithTaint(framework.NoExecuteTaint())), api.WithWorkerNodeGroup(worker1, api.WithTaint(framework.NoExecuteTaint())), @@ -2774,14 +3308,14 @@ func TestCloudStackKubernetes125RedhatTaintsUpgradeFlow(t *testing.T) { ) } -func TestCloudStackKubernetes126RedhatTaintsUpgradeFlow(t *testing.T) { - provider := redhat126ProviderWithTaints(t) +func TestCloudStackKubernetes127RedhatTaintsUpgradeFlow(t *testing.T) { + provider := redhat127ProviderWithTaints(t) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube126), + api.WithKubernetesVersion(v1alpha1.Kube127), api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -2790,7 +3324,7 @@ func TestCloudStackKubernetes126RedhatTaintsUpgradeFlow(t *testing.T) { runTaintsUpgradeFlow( test, - v1alpha1.Kube126, + v1alpha1.Kube127, framework.WithClusterUpgrade( api.WithWorkerNodeGroup(worker0, api.WithTaint(framework.NoExecuteTaint())), api.WithWorkerNodeGroup(worker1, api.WithTaint(framework.NoExecuteTaint())), @@ -2800,14 +3334,14 @@ func TestCloudStackKubernetes126RedhatTaintsUpgradeFlow(t *testing.T) { ) } -func TestCloudStackKubernetes127RedhatTaintsUpgradeFlow(t *testing.T) { - provider := redhat127ProviderWithTaints(t) +func TestCloudStackKubernetes128RedhatTaintsUpgradeFlow(t *testing.T) { + provider := redhat128ProviderWithTaints(t) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube127), + api.WithKubernetesVersion(v1alpha1.Kube128), api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -2816,7 +3350,7 @@ func TestCloudStackKubernetes127RedhatTaintsUpgradeFlow(t *testing.T) { runTaintsUpgradeFlow( test, - v1alpha1.Kube127, + v1alpha1.Kube128, framework.WithClusterUpgrade( api.WithWorkerNodeGroup(worker0, api.WithTaint(framework.NoExecuteTaint())), api.WithWorkerNodeGroup(worker1, api.WithTaint(framework.NoExecuteTaint())), @@ -2826,7 +3360,7 @@ func TestCloudStackKubernetes127RedhatTaintsUpgradeFlow(t *testing.T) { ) } -func redhat128ProviderWithTaints(t *testing.T) *framework.CloudStack { +func redhat123ProviderWithTaints(t *testing.T) *framework.CloudStack { return framework.NewCloudStack(t, framework.WithCloudStackWorkerNodeGroup( worker0, @@ -2840,7 +3374,7 @@ func redhat128ProviderWithTaints(t *testing.T) *framework.CloudStack { worker2, framework.PreferNoScheduleWorkerNodeGroup(worker2, 1), ), - framework.WithCloudStackRedhat128(), + framework.WithCloudStackRedhat123(), ) } @@ -2916,8 +3450,26 @@ func redhat127ProviderWithTaints(t *testing.T) *framework.CloudStack { ) } +func redhat128ProviderWithTaints(t *testing.T) *framework.CloudStack { + return framework.NewCloudStack(t, + framework.WithCloudStackWorkerNodeGroup( + worker0, + framework.NoScheduleWorkerNodeGroup(worker0, 2), + ), + framework.WithCloudStackWorkerNodeGroup( + worker1, + framework.WithWorkerNodeGroup(worker1, api.WithCount(1)), + ), + framework.WithCloudStackWorkerNodeGroup( + worker2, + framework.PreferNoScheduleWorkerNodeGroup(worker2, 1), + ), + framework.WithCloudStackRedhat128(), + ) +} + // Upgrade -func TestCloudStackKubernetes128RedhatAndRemoveWorkerNodeGroups(t *testing.T) { +func TestCloudStackKubernetes123RedhatAndRemoveWorkerNodeGroups(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackWorkerNodeGroup( "worker-1", @@ -2927,13 +3479,13 @@ func TestCloudStackKubernetes128RedhatAndRemoveWorkerNodeGroups(t *testing.T) { "worker-2", framework.WithWorkerNodeGroup("workers-2", api.WithCount(1)), ), - framework.WithCloudStackRedhat128(), + framework.WithCloudStackRedhat123(), ) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube123), api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -2942,7 +3494,7 @@ func TestCloudStackKubernetes128RedhatAndRemoveWorkerNodeGroups(t *testing.T) { runSimpleUpgradeFlow( test, - v1alpha1.Kube128, + v1alpha1.Kube123, framework.WithClusterUpgrade( api.RemoveWorkerNodeGroup("workers-2"), api.WithWorkerNodeGroup("workers-1", api.WithCount(1)), @@ -3117,7 +3669,65 @@ func TestCloudStackKubernetes127RedhatAndRemoveWorkerNodeGroups(t *testing.T) { ) } +func TestCloudStackKubernetes128RedhatAndRemoveWorkerNodeGroups(t *testing.T) { + provider := framework.NewCloudStack(t, + framework.WithCloudStackWorkerNodeGroup( + "worker-1", + framework.WithWorkerNodeGroup("workers-1", api.WithCount(2)), + ), + framework.WithCloudStackWorkerNodeGroup( + "worker-2", + framework.WithWorkerNodeGroup("workers-2", api.WithCount(1)), + ), + framework.WithCloudStackRedhat128(), + ) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller( + api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithExternalEtcdTopology(1), + api.WithControlPlaneCount(1), + api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate + ), + ) + + runSimpleUpgradeFlow( + test, + v1alpha1.Kube128, + framework.WithClusterUpgrade( + api.RemoveWorkerNodeGroup("workers-2"), + api.WithWorkerNodeGroup("workers-1", api.WithCount(1)), + ), + provider.WithNewCloudStackWorkerNodeGroup( + "worker-1", + framework.WithWorkerNodeGroup( + "workers-3", + api.WithCount(1), + ), + ), + ) +} + // TODO: 1.23 to 1.24 upgrade tests +func TestCloudStackKubernetes123To124RedhatUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithStackedEtcdTopology()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + ) + runSimpleUpgradeFlow( + test, + v1alpha1.Kube124, + framework.WithClusterFiller(api.WithStackedEtcdTopology()), + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube124)), + provider.WithProviderUpgrade(provider.Redhat124Template()), + ) +} + func TestCloudStackKubernetes124To125RedhatUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) test := framework.NewClusterE2ETest( @@ -3190,20 +3800,20 @@ func TestCloudStackKubernetes127To128RedhatUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes127To128RedhatUnstackedUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) +func TestCloudStackKubernetes123To124RedhatUnstackedUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), ) runSimpleUpgradeFlow( test, - v1alpha1.Kube128, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), - provider.WithProviderUpgrade(provider.Redhat128Template()), + v1alpha1.Kube124, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube124)), + provider.WithProviderUpgrade(provider.Redhat124Template()), ) } @@ -3258,12 +3868,29 @@ func TestCloudStackKubernetes126To127RedhatUnstackedUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes128RedhatTo124StackedEtcdUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) +func TestCloudStackKubernetes127To128RedhatUnstackedUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + ) + runSimpleUpgradeFlow( + test, + v1alpha1.Kube128, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), + provider.WithProviderUpgrade(provider.Redhat128Template()), + ) +} + +func TestCloudStackKubernetes123RedhatTo124StackedEtcdUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithStackedEtcdTopology()), @@ -3330,22 +3957,40 @@ func TestCloudStackKubernetes126RedhatTo127StackedEtcdUpgrade(t *testing.T) { ) } +func TestCloudStackKubernetes127RedhatTo128StackedEtcdUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + framework.WithClusterFiller(api.WithStackedEtcdTopology()), + ) + runSimpleUpgradeFlow( + test, + v1alpha1.Kube128, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), + provider.WithProviderUpgrade(provider.Redhat128Template()), + ) +} + // TODO: investigate these tests further as they pass even without the expected behavior(upgrade should fail the first time and continue from the checkpoint on second upgrade)wq -func TestCloudStackKubernetes128RedhatTo124UpgradeWithCheckpoint(t *testing.T) { +func TestCloudStackKubernetes123RedhatTo124UpgradeWithCheckpoint(t *testing.T) { var clusterOpts []framework.ClusterE2ETestOpt var clusterOpts2 []framework.ClusterE2ETestOpt - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), ) clusterOpts = append(clusterOpts, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube124)), framework.ExpectFailure(true), - provider.WithProviderUpgrade(provider.Redhat128Template()), framework.WithEnvVar(features.CheckpointEnabledEnvVar, "true"), framework.WithEnvVar(framework.CleanupVmsVar, "false")) + provider.WithProviderUpgrade(provider.Redhat123Template()), framework.WithEnvVar(features.CheckpointEnabledEnvVar, "true"), framework.WithEnvVar(framework.CleanupVmsVar, "false")) commandOpts := []framework.CommandOpt{framework.WithExternalEtcdWaitTimeout("10m")} @@ -3451,13 +4096,43 @@ func TestCloudStackKubernetes126RedhatTo127UpgradeWithCheckpoint(t *testing.T) { ) } -func TestCloudStackKubernetes128RedhatUpgradeFromLatestMinorReleaseAlwaysNetworkPolicy(t *testing.T) { +func TestCloudStackKubernetes127RedhatTo128UpgradeWithCheckpoint(t *testing.T) { + var clusterOpts []framework.ClusterE2ETestOpt + var clusterOpts2 []framework.ClusterE2ETestOpt + + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + ) + + clusterOpts = append(clusterOpts, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), framework.ExpectFailure(true), + provider.WithProviderUpgrade(provider.Redhat127Template()), framework.WithEnvVar(features.CheckpointEnabledEnvVar, "true"), framework.WithEnvVar(framework.CleanupVmsVar, "false")) + + commandOpts := []framework.CommandOpt{framework.WithExternalEtcdWaitTimeout("10m")} + + clusterOpts2 = append(clusterOpts, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), framework.ExpectFailure(false), + provider.WithProviderUpgrade(provider.Redhat128Template()), framework.WithEnvVar(features.CheckpointEnabledEnvVar, "true"), framework.WithEnvVar(framework.CleanupVmsVar, "true")) + + runUpgradeFlowWithCheckpoint( + test, + v1alpha1.Kube128, + clusterOpts, + clusterOpts2, + commandOpts, + ) +} + +func TestCloudStackKubernetes123RedhatUpgradeFromLatestMinorReleaseAlwaysNetworkPolicy(t *testing.T) { release := latestMinorRelease(t) - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), @@ -3465,10 +4140,10 @@ func TestCloudStackKubernetes128RedhatUpgradeFromLatestMinorReleaseAlwaysNetwork runUpgradeFromReleaseFlow( test, release, - v1alpha1.Kube128, + v1alpha1.Kube123, framework.WithClusterFiller(api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways)), provider.WithProviderUpgrade( - provider.Redhat128Template(), // Set the template so it doesn't get autoimported + provider.Redhat123Template(), // Set the template so it doesn't get autoimported ), ) } @@ -3495,18 +4170,18 @@ func TestCloudStackKubernetes124RedhatUpgradeFromLatestMinorReleaseAlwaysNetwork ) } -func TestCloudStackKubernetes128RedhatControlPlaneNodeUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) +func TestCloudStackKubernetes123RedhatControlPlaneNodeUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), ) runSimpleUpgradeFlow( test, - v1alpha1.Kube128, + v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithControlPlaneCount(3)), ) } @@ -3575,7 +4250,7 @@ func TestCloudStackKubernetes127RedhatControlPlaneNodeUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes128RedhatWorkerNodeUpgrade(t *testing.T) { +func TestCloudStackKubernetes128RedhatControlPlaneNodeUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) test := framework.NewClusterE2ETest( t, @@ -3587,6 +4262,22 @@ func TestCloudStackKubernetes128RedhatWorkerNodeUpgrade(t *testing.T) { runSimpleUpgradeFlow( test, v1alpha1.Kube128, + framework.WithClusterUpgrade(api.WithControlPlaneCount(3)), + ) +} + +func TestCloudStackKubernetes123RedhatWorkerNodeUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(3)), + ) + runSimpleUpgradeFlow( + test, + v1alpha1.Kube123, framework.WithClusterUpgrade(api.WithWorkerNodeCount(5)), ) } @@ -3655,13 +4346,29 @@ func TestCloudStackKubernetes127RedhatWorkerNodeUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes128UpgradeFromLatestMinorRelease(t *testing.T) { - release := latestMinorRelease(t) +func TestCloudStackKubernetes128RedhatWorkerNodeUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(3)), + ) + runSimpleUpgradeFlow( + test, + v1alpha1.Kube128, + framework.WithClusterUpgrade(api.WithWorkerNodeCount(5)), + ) +} + +func TestCloudStackKubernetes123UpgradeFromLatestMinorRelease(t *testing.T) { + release := latestMinorRelease(t) + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), @@ -3669,7 +4376,7 @@ func TestCloudStackKubernetes128UpgradeFromLatestMinorRelease(t *testing.T) { runUpgradeFromReleaseFlow( test, release, - v1alpha1.Kube128, + v1alpha1.Kube123, provider.WithProviderUpgrade(), ) } @@ -3694,20 +4401,20 @@ func TestCloudStackKubernetes124UpgradeFromLatestMinorRelease(t *testing.T) { } // TODO: More 1.23 to 1.24 Upgrade tests -func TestCloudStackKubernetes127To128RedhatMultipleFieldsUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) +func TestCloudStackKubernetes123To124RedhatMultipleFieldsUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), ) runSimpleUpgradeFlow( test, - v1alpha1.Kube128, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), + v1alpha1.Kube124, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube124)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), provider.WithProviderUpgrade( - provider.Redhat128Template(), + provider.Redhat124Template(), framework.UpdateLargerCloudStackComputeOffering(), ), ) @@ -3770,12 +4477,31 @@ func TestCloudStackKubernetes126To127RedhatMultipleFieldsUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes128AddRemoveAz(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat128()) +func TestCloudStackKubernetes127To128RedhatMultipleFieldsUpgrade(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + ) + runSimpleUpgradeFlow( + test, + v1alpha1.Kube128, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + provider.WithProviderUpgrade( + provider.Redhat128Template(), + framework.UpdateLargerCloudStackComputeOffering(), + ), + ) +} + +func TestCloudStackKubernetes123AddRemoveAz(t *testing.T) { + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat123()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), ) @@ -3825,11 +4551,11 @@ func TestCloudStackKubernetes124AddRemoveAz(t *testing.T) { } // This test is skipped as registry mirror was not configured for CloudStack -func TestCloudStackKubernetes128RedhatAirgappedRegistryMirror(t *testing.T) { +func TestCloudStackKubernetes123RedhatAirgappedRegistryMirror(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewCloudStack(t, - framework.WithCloudStackRedhat128(), + framework.WithCloudStackRedhat123(), framework.WithCloudStackFillers( framework.RemoveAllCloudStackAzs(), framework.UpdateAddCloudStackAz3(), @@ -3841,7 +4567,7 @@ func TestCloudStackKubernetes128RedhatAirgappedRegistryMirror(t *testing.T) { api.WithWorkerNodeCount(1), ), // framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), there is a bug that the etcd node download etcd from internet - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube123)), framework.WithRegistryMirrorEndpointAndCert(constants.CloudStackProviderName), ) @@ -3915,7 +4641,7 @@ func TestCloudStackKubernetes126RedhatAirgappedRegistryMirror(t *testing.T) { } // Workload API -func TestCloudStackKubernetes128RedHatAPI(t *testing.T) { +func TestCloudStackKubernetes123RedHatAPI(t *testing.T) { cloudstack := framework.NewCloudStack(t) test := framework.NewClusterE2ETest( t, cloudstack, @@ -3925,7 +4651,7 @@ func TestCloudStackKubernetes128RedHatAPI(t *testing.T) { api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), ) test.CreateCluster() @@ -3977,7 +4703,7 @@ func TestCloudStackMulticlusterWorkloadClusterAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), ) test := framework.NewMulticlusterE2ETest(t, managementCluster) @@ -3992,7 +4718,7 @@ func TestCloudStackMulticlusterWorkloadClusterAPI(t *testing.T) { api.WithStackedEtcdTopology(), api.WithControlPlaneCount(1), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), ), ) @@ -4063,7 +4789,7 @@ func TestCloudStackMulticlusterWorkloadClusterNewCredentialsSecretsAPI(t *testin api.CloudStackToConfigFiller( api.WithCloudStackCredentialsRef("test-creds"), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), )) test.WithWorkloadClusters(framework.NewClusterE2ETest( @@ -4098,7 +4824,7 @@ func TestCloudStackMulticlusterWorkloadClusterNewCredentialsSecretsAPI(t *testin test.DeleteManagementCluster() } -func TestCloudStackKubernetesRedHat127To128UpgradeFromLatestMinorReleaseAPI(t *testing.T) { +func TestCloudStackKubernetesRedHat123To124UpgradeFromLatestMinorReleaseAPI(t *testing.T) { release := latestMinorRelease(t) cloudstack := framework.NewCloudStack(t) managementCluster := framework.NewClusterE2ETest( @@ -4107,7 +4833,7 @@ func TestCloudStackKubernetesRedHat127To128UpgradeFromLatestMinorReleaseAPI(t *t ) managementCluster.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release)) managementCluster.UpdateClusterConfig( - cloudstack.WithKubeVersionAndOS(v1alpha1.Kube127, framework.RedHat8, release), + cloudstack.WithKubeVersionAndOS(v1alpha1.Kube123, framework.RedHat8, release), ) test := framework.NewMulticlusterE2ETest(t, managementCluster) wc := framework.NewClusterE2ETest( @@ -4120,20 +4846,20 @@ func TestCloudStackKubernetesRedHat127To128UpgradeFromLatestMinorReleaseAPI(t *t api.ClusterToConfigFiller( api.WithManagementCluster(managementCluster.ClusterName), ), - cloudstack.WithKubeVersionAndOS(v1alpha1.Kube127, framework.RedHat8, release), + cloudstack.WithKubeVersionAndOS(v1alpha1.Kube123, framework.RedHat8, release), ) test.WithWorkloadClusters(wc) runMulticlusterUpgradeFromReleaseFlowAPI( test, release, - v1alpha1.Kube128, + v1alpha1.Kube124, framework.RedHat8, ) } // Workload GitOps API -func TestCloudStackKubernetesRedHat127to128UpgradeFromLatestMinorReleaseGitHubFluxAPI(t *testing.T) { +func TestCloudStackKubernetesRedHat123to124UpgradeFromLatestMinorReleaseGitHubFluxAPI(t *testing.T) { release := latestMinorRelease(t) cloudstack := framework.NewCloudStack(t) managementCluster := framework.NewClusterE2ETest( @@ -4145,7 +4871,7 @@ func TestCloudStackKubernetesRedHat127to128UpgradeFromLatestMinorReleaseGitHubFl ) managementCluster.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release)) managementCluster.UpdateClusterConfig( - cloudstack.WithKubeVersionAndOS(v1alpha1.Kube127, framework.RedHat8, release), + cloudstack.WithKubeVersionAndOS(v1alpha1.Kube123, framework.RedHat8, release), framework.WithFluxGithubConfig(), ) test := framework.NewMulticlusterE2ETest(t, managementCluster) @@ -4162,7 +4888,7 @@ func TestCloudStackKubernetesRedHat127to128UpgradeFromLatestMinorReleaseGitHubFl api.ClusterToConfigFiller( api.WithManagementCluster(managementCluster.ClusterName), ), - cloudstack.WithKubeVersionAndOS(v1alpha1.Kube127, framework.RedHat8, release), + cloudstack.WithKubeVersionAndOS(v1alpha1.Kube123, framework.RedHat8, release), framework.WithFluxGithubConfig(), ) test.WithWorkloadClusters(wc) @@ -4170,7 +4896,7 @@ func TestCloudStackKubernetesRedHat127to128UpgradeFromLatestMinorReleaseGitHubFl runMulticlusterUpgradeFromReleaseFlowAPIWithFlux( test, release, - v1alpha1.Kube128, + v1alpha1.Kube124, framework.RedHat8, ) } @@ -4189,7 +4915,7 @@ func TestCloudStackMulticlusterWorkloadClusterGitHubFluxAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), framework.WithFluxGithubConfig(), ) @@ -4205,7 +4931,7 @@ func TestCloudStackMulticlusterWorkloadClusterGitHubFluxAPI(t *testing.T) { api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), ), ) @@ -4280,7 +5006,7 @@ func TestCloudStackMulticlusterWorkloadClusterNewCredentialsSecretGitHubFluxAPI( api.CloudStackToConfigFiller( api.WithCloudStackCredentialsRef("test-creds"), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), )) test.WithWorkloadClusters(framework.NewClusterE2ETest( @@ -4342,7 +5068,7 @@ func TestCloudStackWorkloadClusterAWSIamAuthAPI(t *testing.T) { api.WithStackedEtcdTopology(), ), framework.WithAwsIamConfig(), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), ), ) @@ -4377,7 +5103,7 @@ func TestCloudStackWorkloadClusterAWSIamAuthGithubFluxAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), framework.WithFluxGithubConfig(), ) @@ -4395,7 +5121,7 @@ func TestCloudStackWorkloadClusterAWSIamAuthGithubFluxAPI(t *testing.T) { api.WithStackedEtcdTopology(), ), framework.WithAwsIamConfig(), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), ), ) @@ -4443,7 +5169,7 @@ func TestCloudStackWorkloadClusterOIDCAuthAPI(t *testing.T) { api.WithStackedEtcdTopology(), ), framework.WithOIDCClusterConfig(t), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), ), ) @@ -4478,7 +5204,7 @@ func TestCloudStackWorkloadClusterOIDCAuthGithubFluxAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), framework.WithFluxGithubConfig(), ) @@ -4496,7 +5222,7 @@ func TestCloudStackWorkloadClusterOIDCAuthGithubFluxAPI(t *testing.T) { api.WithStackedEtcdTopology(), ), framework.WithOIDCClusterConfig(t), - cloudstack.WithRedhat128(), + cloudstack.WithRedhat123(), ), )