diff --git a/release/cli/go.mod b/release/cli/go.mod index 97af721ffc65..acb065122f13 100644 --- a/release/cli/go.mod +++ b/release/cli/go.mod @@ -174,4 +174,9 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) -replace github.com/aws/eks-anywhere => ../../ +replace ( + github.com/aws/eks-anywhere => ../../ + github.com/aws/eks-anywhere/internal/aws-sdk-go-v2/internal/configsources => ./internal/aws-sdk-go-v2/internal/configsources + github.com/aws/eks-anywhere/internal/aws-sdk-go-v2/internal/endpoints/v2 => ./internal/aws-sdk-go-v2/internal/endpoints/v2 + github.com/aws/eks-anywhere/internal/aws-sdk-go-v2/service/snowballdevice => ./internal/aws-sdk-go-v2/service/snowballdevice +) diff --git a/scripts/e2e_test_docker.sh b/scripts/e2e_test_docker.sh index 3e832f4a8166..61fd597e863b 100755 --- a/scripts/e2e_test_docker.sh +++ b/scripts/e2e_test_docker.sh @@ -36,7 +36,7 @@ fi REPO_ROOT=$(git rev-parse --show-toplevel) BIN_FOLDER=$REPO_ROOT/bin -TEST_REGEX="${1:-TestDockerKubernetes121SimpleFlow}" +TEST_REGEX="${1:-TestDockerKubernetes125SimpleFlow}" BRANCH_NAME="${2:-main}" diff --git a/test/e2e/SKIPPED_TESTS.yaml b/test/e2e/SKIPPED_TESTS.yaml index d5c8a160757e..7c98b79a9862 100644 --- a/test/e2e/SKIPPED_TESTS.yaml +++ b/test/e2e/SKIPPED_TESTS.yaml @@ -2,21 +2,13 @@ skipped_tests: # CloudStack #Airgapped tests - TestCloudStackKubernetes123RedhatAirgappedRegistryMirror -- TestCloudStackKubernetes124RedhatAirgappedRegistryMirror - TestCloudStackKubernetes125RedhatAirgappedRegistryMirror - TestCloudStackKubernetes126RedhatAirgappedRegistryMirror # This test will fail until we the latest minor release version is 15.x as there is a preflight for 1.24 -- TestCloudStackKubernetes124RedhatUpgradeFromLatestMinorReleaseAlwaysNetworkPolicy -- TestCloudStackKubernetes124ManagementClusterUpgradeFromLatest -- TestCloudStackKubernetes124UpgradeFromLatestMinorRelease - TestCloudStackKubernetes123RedhatProxyConfig -- TestCloudStackKubernetes124RedhatProxyConfig - TestCloudStackKubernetes123RedhatProxyConfigAPI -- TestCloudStackKubernetes124RedhatProxyConfigAPI - TestCloudStackKubernetes123AddRemoveAz -- TestCloudStackKubernetes124AddRemoveAz - TestCloudStackKubernetes123MultiEndpointSimpleFlow -- TestCloudStackKubernetes124MultiEndpointSimpleFlow - TestCloudStackKubernetes125MultiEndpointSimpleFlow - TestCloudStackKubernetes126MultiEndpointSimpleFlow - TestCloudStackKubernetes127MultiEndpointSimpleFlow @@ -30,7 +22,6 @@ skipped_tests: # Proxy tests - TestCloudStackKubernetes123RedhatProxyConfigAPI -- TestCloudStackKubernetes124RedhatProxyConfigAPI - TestCloudStackKubernetes125RedhatProxyConfigAPI - TestCloudStackKubernetes126RedhatProxyConfigAPI - TestCloudStackKubernetes127RedhatProxyConfigAPI @@ -46,15 +37,12 @@ skipped_tests: - TestSnowKubernetes128OIDC - TestSnowKubernetes128UbuntuProxyConfig # - TestSnowKubernetes127UbuntuTo128Upgrade -# - TestSnowKubernetes124UbuntuTo125Upgrade -# - TestSnowKubernetes125UbuntuTo126Upgrade +# # - TestSnowKubernetes125UbuntuTo126Upgrade # - TestSnowKubernetes126UbuntuTo127Upgrade - TestSnowKubernetes127BottlerocketTo128Upgrade -- TestSnowKubernetes124BottlerocketTo125Upgrade - TestSnowKubernetes125BottlerocketTo126Upgrade - TestSnowKubernetes126BottlerocketTo127Upgrade - TestSnowKubernetes127To128BottlerocketStaticIPUpgrade -- TestSnowKubernetes124To125BottlerocketStaticIPUpgrade - TestSnowKubernetes125To126BottlerocketStaticIPUpgrade - TestSnowKubernetes126To127BottlerocketStaticIPUpgrade - TestSnowMulticlusterWorkloadClusterAPI @@ -79,27 +67,21 @@ skipped_tests: - TestTinkerbellKubernetes128WithNodesPoweredOn # Skipping a few redundant tests - TestTinkerbellKubernetes123RedHatSimpleFlow -- TestTinkerbellKubernetes124RedHatSimpleFlow - TestTinkerbellKubernetes125RedHatSimpleFlow - TestTinkerbellKubernetes126RedHatSimpleFlow - TestTinkerbellKubernetes127RedHatSimpleFlow - TestTinkerbellKubernetes128RedHatSimpleFlow - TestTinkerbellKubernetes123UbuntuSimpleFlow -- TestTinkerbellKubernetes124UbuntuSimpleFlow - TestTinkerbellKubernetes125UbuntuSimpleFlow - TestTinkerbellKubernetes126UbuntuSimpleFlow - TestTinkerbellKubernetes123Ubuntu2204SimpleFlow -- TestTinkerbellKubernetes124Ubuntu2204SimpleFlow - TestTinkerbellKubernetes125Ubuntu2204SimpleFlow - TestTinkerbellKubernetes126Ubuntu2204SimpleFlow - TestTinkerbellKubernetes123BottleRocketSimpleFlow -- TestTinkerbellKubernetes124BottleRocketSimpleFlow -- TestTinkerbellKubernetes123UbuntuTo124Upgrade - TestTinkerbellKubernetes125To126Ubuntu2204Upgrade - TestTinkerbellKubernetes126Ubuntu2004To2204Upgrade - TestTinkerbellKubernetes126UbuntuThreeWorkersSimpleFlow - TestTinkerbellAirgappedKubernetes126BottleRocketRegistryMirror -- TestTinkerbellKubernetes124UbuntuTo125Upgrade - TestTinkerbellKubernetes128SkipPowerActions - TestTinkerbellKubernetes128SingleNodeSkipPowerActions - TestTinkerbellKubernetes125UbuntuWorkerNodeScaleUpWithAPI @@ -124,14 +106,6 @@ skipped_tests: - TestTinkerbellKubernetes125BottleRocketCuratedPackagesAdotSimpleFlow - TestTinkerbellKubernetes125UbuntuCuratedPackagesPrometheusSimpleFlow - TestTinkerbellKubernetes125BottleRocketCuratedPackagesPrometheusSimpleFlow -- TestTinkerbellKubernetes124UbuntuSingleNodeCuratedPackagesEmissaryFlow -- TestTinkerbellKubernetes124BottleRocketSingleNodeCuratedPackagesEmissaryFlow -- TestTinkerbellKubernetes124UbuntuSingleNodeCuratedPackagesHarborFlow -- TestTinkerbellKubernetes124BottleRocketSingleNodeCuratedPackagesHarborFlow -- TestTinkerbellKubernetes124UbuntuCuratedPackagesAdotSimpleFlow -- TestTinkerbellKubernetes124BottleRocketCuratedPackagesAdotSimpleFlow -- TestTinkerbellKubernetes124UbuntuCuratedPackagesPrometheusSimpleFlow -- TestTinkerbellKubernetes124BottleRocketCuratedPackagesPrometheusSimpleFlow - TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesEmissaryFlow - TestTinkerbellKubernetes127BottleRocketSingleNodeCuratedPackagesEmissaryFlow - TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesHarborFlow diff --git a/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml b/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml index f35f5c6325ad..19078c37744d 100644 --- a/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml +++ b/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml @@ -34,16 +34,6 @@ TestTinkerbellKubernetes125UbuntuCuratedPackagesAdotSimpleFlow: 1 TestTinkerbellKubernetes125BottleRocketCuratedPackagesAdotSimpleFlow: 1 TestTinkerbellKubernetes125UbuntuCuratedPackagesPrometheusSimpleFlow: 1 TestTinkerbellKubernetes125BottleRocketCuratedPackagesPrometheusSimpleFlow: 1 -TestTinkerbellKubernetes124UbuntuSingleNodeCuratedPackagesFlow: 1 -TestTinkerbellKubernetes124BottleRocketSingleNodeCuratedPackagesFlow: 1 -TestTinkerbellKubernetes124UbuntuSingleNodeCuratedPackagesEmissaryFlow: 1 -TestTinkerbellKubernetes124BottleRocketSingleNodeCuratedPackagesEmissaryFlow: 1 -TestTinkerbellKubernetes124UbuntuSingleNodeCuratedPackagesHarborFlow: 1 -TestTinkerbellKubernetes124BottleRocketSingleNodeCuratedPackagesHarborFlow: 1 -TestTinkerbellKubernetes124UbuntuCuratedPackagesAdotSimpleFlow: 1 -TestTinkerbellKubernetes124BottleRocketCuratedPackagesAdotSimpleFlow: 1 -TestTinkerbellKubernetes124UbuntuCuratedPackagesPrometheusSimpleFlow: 1 -TestTinkerbellKubernetes124BottleRocketCuratedPackagesPrometheusSimpleFlow: 1 TestTinkerbellKubernetes128UbuntuSingleNodeCuratedPackagesFlow: 1 TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesFlow: 1 TestTinkerbellKubernetes128UbuntuSingleNodeCuratedPackagesEmissaryFlow: 1 @@ -69,7 +59,6 @@ TestTinkerbellKubernetes128BottlerocketSingleNodeWorkloadClusterWithAPI: 2 TestTinkerbellKubernetes128BottlerocketWorkloadClusterSkipPowerActions: 4 TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleup: 5 TestTinkerbellSingleNode125ManagementScaleupWorkloadWithAPI: 4 -TestTinkerbellKubernetes124UbuntuTo125Upgrade: 4 TestTinkerbellKubernetes125UbuntuTo126Upgrade: 4 TestTinkerbellKubernetes126UbuntuTo127Upgrade: 4 TestTinkerbellKubernetes127UbuntuTo128Upgrade: 4 @@ -83,7 +72,7 @@ TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI: TestTinkerbellUpgrade128MulticlusterWorkloadClusterCPScaleup: 6 TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleDown: 5 TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade127To128: 6 -TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade124To125WithAPI: 4 +TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade125To126WithAPI: 4 TestTinkerbellKubernetes128WithNodesPoweredOn: 2 TestTinkerbellKubernetes128OIDC: 2 TestTinkerbellKubernetes128UbuntuRegistryMirror: 2 @@ -91,22 +80,18 @@ TestTinkerbellKubernetes128UbuntuInsecureSkipVerifyRegistryMirror: 2 TestTinkerbellKubernetes128BottlerocketRegistryMirror: 2 TestTinkerbellKubernetes128UbuntuAuthenticatedRegistryMirror: 2 TestTinkerbellKubernetes128BottlerocketAuthenticatedRegistryMirror: 2 -TestTinkerbellKubernetes124UbuntuSimpleFlow: 2 TestTinkerbellKubernetes125UbuntuSimpleFlow: 2 TestTinkerbellKubernetes126UbuntuSimpleFlow: 2 TestTinkerbellKubernetes127UbuntuSimpleFlow: 2 TestTinkerbellKubernetes128UbuntuSimpleFlow: 2 -TestTinkerbellKubernetes124Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes125Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes126Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes127Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes128Ubuntu2204SimpleFlow: 2 -TestTinkerbellKubernetes124RedHatSimpleFlow: 2 TestTinkerbellKubernetes125RedHatSimpleFlow: 2 TestTinkerbellKubernetes126RedHatSimpleFlow: 2 TestTinkerbellKubernetes127RedHatSimpleFlow: 2 TestTinkerbellKubernetes128RedHatSimpleFlow: 2 -TestTinkerbellKubernetes124BottleRocketSimpleFlow: 2 TestTinkerbellKubernetes125BottleRocketSimpleFlow: 2 TestTinkerbellKubernetes126BottleRocketSimpleFlow: 2 TestTinkerbellKubernetes127BottleRocketSimpleFlow: 2 diff --git a/test/e2e/cloudstack_test.go b/test/e2e/cloudstack_test.go index 13eea48b43ba..4e78d22fc1c1 100644 --- a/test/e2e/cloudstack_test.go +++ b/test/e2e/cloudstack_test.go @@ -18,16 +18,6 @@ import ( ) // AWS IAM Auth -func TestCloudStackKubernetes124AWSIamAuth(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithAWSIam(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runAWSIamAuthFlow(test) -} - func TestCloudStackKubernetes125AWSIamAuth(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -68,23 +58,6 @@ func TestCloudStackKubernetes128AWSIamAuth(t *testing.T) { runAWSIamAuthFlow(test) } -// TODO: Add TestCloudStackKubernetes123to124AWSIamAuthUpgrade -func TestCloudStackKubernetes124to125AWSIamAuthUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithAWSIam(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runUpgradeFlowWithAWSIamAuth( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(provider.Redhat125Template()), - ) -} - func TestCloudStackKubernetes125to126AWSIamAuthUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest( @@ -134,19 +107,6 @@ func TestCloudStackKubernetes127to128AWSIamAuthUpgrade(t *testing.T) { } // Curated packages test -func TestCloudStackKubernetes124RedhatCuratedPackagesSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - "my-packages-test", EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageInstallSimpleFlow(test) -} - func TestCloudStackKubernetes125RedhatCuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest( @@ -199,19 +159,6 @@ func TestCloudStackKubernetes128RedhatCuratedPackagesSimpleFlow(t *testing.T) { runCuratedPackageInstallSimpleFlow(test) } -func TestCloudStackKubernetes124RedhatCuratedPackagesEmissarySimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - "my-packages-test", EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageEmissaryInstallSimpleFlow(test) -} - func TestCloudStackKubernetes125RedhatCuratedPackagesEmissarySimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest( @@ -264,19 +211,6 @@ func TestCloudStackKubernetes128RedhatCuratedPackagesEmissarySimpleFlow(t *testi runCuratedPackageEmissaryInstallSimpleFlow(test) } -func TestCloudStackKubernetes124RedhatCuratedPackagesHarborSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - "my-packages-test", EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) -} - func TestCloudStackKubernetes125RedhatCuratedPackagesHarborSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest( @@ -329,13 +263,6 @@ func TestCloudStackKubernetes128RedhatCuratedPackagesHarborSimpleFlow(t *testing runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) } -func TestCloudStackKubernetes124RedhatWorkloadClusterCuratedPackagesSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube124) - runCuratedPackageRemoteClusterInstallSimpleFlow(test) -} - func TestCloudStackKubernetes125RedhatWorkloadClusterCuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) @@ -364,13 +291,6 @@ func TestCloudStackKubernetes128RedhatWorkloadClusterCuratedPackagesSimpleFlow(t runCuratedPackageRemoteClusterInstallSimpleFlow(test) } -func TestCloudStackKubernetes124RedhatWorkloadClusterCuratedPackagesEmissarySimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube124) - runCuratedPackageEmissaryRemoteClusterInstallSimpleFlow(test) -} - func TestCloudStackKubernetes125RedhatWorkloadClusterCuratedPackagesEmissarySimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) @@ -399,14 +319,6 @@ func TestCloudStackKubernetes128RedhatWorkloadClusterCuratedPackagesEmissarySimp runCuratedPackageEmissaryRemoteClusterInstallSimpleFlow(test) } -func TestCloudStackKubernetes124RedhatCuratedPackagesCertManagerSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - framework.CheckCertManagerCredentials(t) - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube124) - runCertManagerRemoteClusterInstallSimpleFlow(test) -} - func TestCloudStackKubernetes125RedhatCuratedPackagesCertManagerSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) framework.CheckCertManagerCredentials(t) @@ -439,18 +351,6 @@ func TestCloudStackKubernetes128RedhatCuratedPackagesCertManagerSimpleFlow(t *te runCertManagerRemoteClusterInstallSimpleFlow(test) } -func TestCloudStackKubernetes124RedhatCuratedPackagesAdotSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - "my-packages-test", EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesAdotInstallSimpleFlow(test) -} - func TestCloudStackKubernetes125RedhatCuratedPackagesAdotSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -499,18 +399,6 @@ func TestCloudStackKubernetes128RedhatCuratedPackagesAdotSimpleFlow(t *testing.T runCuratedPackagesAdotInstallSimpleFlow(test) } -func TestCloudStackKubernetes124RedhatCuratedPackagesAdotUpdateFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - "my-packages-test", EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesAdotInstallUpdateFlow(test) -} - func TestCloudStackKubernetes125RedhatCuratedPackagesAdotUpdateFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -559,21 +447,6 @@ func TestCloudStackKubernetes128RedhatCuratedPackagesAdotUpdateFlow(t *testing.T runCuratedPackagesAdotInstallUpdateFlow(test) } -func TestCloudStackKubernetes124RedHatCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { - minNodes := 1 - maxNodes := 2 - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runAutoscalerWithMetricsServerSimpleFlow(test) -} - func TestCloudStackKubernetes125RedHatCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { minNodes := 1 maxNodes := 2 @@ -634,18 +507,6 @@ func TestCloudStackKubernetes128RedHatCuratedPackagesClusterAutoscalerSimpleFlow runAutoscalerWithMetricsServerSimpleFlow(test) } -func TestCloudStackKubernetes124RedhatCuratedPackagesPrometheusSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - "my-packages-test", EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesPrometheusInstallSimpleFlow(test) -} - func TestCloudStackKubernetes125RedhatCuratedPackagesPrometheusSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -698,27 +559,15 @@ func TestCloudStackKubernetes128RedhatCuratedPackagesPrometheusSimpleFlow(t *tes func TestCloudStackDownloadArtifacts(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), + 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.Kube124)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), ) runDownloadArtifactsFlow(test) } -func TestCloudStackKubernetes124GithubFlux(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithFluxGithub(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runFluxFlow(test) -} - func TestCloudStackKubernetes125GithubFlux(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewCloudStack(t, framework.WithCloudStackRedhat125()), @@ -767,18 +616,6 @@ func TestCloudStackKubernetes128GithubFlux(t *testing.T) { runFluxFlow(test) } -func TestCloudStackKubernetes124GitFlux(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithFluxGit(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runFluxFlow(test) -} - func TestCloudStackKubernetes125GitFlux(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewCloudStack(t, framework.WithCloudStackRedhat125()), @@ -827,25 +664,6 @@ func TestCloudStackKubernetes128GitFlux(t *testing.T) { runFluxFlow(test) } -// TODO: Add 1.23 to 1.24 flux upgrade tests -func TestCloudStackKubernetes124To125GitFluxUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest(t, - provider, - framework.WithFluxGit(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runUpgradeFlowWithFlux( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(provider.Redhat125Template()), - ) -} - func TestCloudStackKubernetes125To126GitFluxUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest(t, @@ -900,23 +718,6 @@ func TestCloudStackKubernetes127To128GitFluxUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes124InstallGitFluxDuringUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest(t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runUpgradeFlowWithFlux( - test, - v1alpha1.Kube124, - framework.WithFluxGit(), - framework.WithClusterUpgrade(api.WithGitOpsRef(framework.DefaultFluxConfigName, v1alpha1.FluxConfigKind)), - ) -} - func TestCloudStackKubernetes125InstallGitFluxDuringUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest(t, @@ -986,28 +787,6 @@ func TestCloudStackKubernetes128InstallGitFluxDuringUpgrade(t *testing.T) { } // Labels -func TestCloudStackKubernetes124LabelsAndNodeNameRedhat(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, - framework.WithCloudStackRedhat124(), - ), - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), - 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 TestCloudStackKubernetes125LabelsAndNodeNameRedhat(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1096,32 +875,6 @@ func TestCloudStackKubernetes128LabelsAndNodeNameRedhat(t *testing.T) { test.DeleteCluster() } -func TestCloudStackKubernetes124RedhatLabelsUpgradeFlow(t *testing.T) { - provider := redhat124ProviderWithLabels(t) - - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), - api.WithExternalEtcdTopology(1), - api.WithControlPlaneCount(1), - api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate - ), - ) - - runLabelsUpgradeFlow( - test, - v1alpha1.Kube124, - framework.WithClusterUpgrade( - api.WithWorkerNodeGroup(worker0, api.WithLabel(key1, val1)), - api.WithWorkerNodeGroup(worker1, api.WithLabel(key2, val2)), - api.WithWorkerNodeGroup(worker2), - api.WithControlPlaneLabel(cpKey1, cpVal1), - ), - ) -} - func TestCloudStackKubernetes125RedhatLabelsUpgradeFlow(t *testing.T) { provider := redhat125ProviderWithLabels(t) @@ -1226,26 +979,6 @@ func TestCloudStackKubernetes128RedhatLabelsUpgradeFlow(t *testing.T) { ) } -func redhat124ProviderWithLabels(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.WithCloudStackRedhat124(), - ) -} - func redhat125ProviderWithLabels(t *testing.T) *framework.CloudStack { return framework.NewCloudStack(t, framework.WithCloudStackWorkerNodeGroup( @@ -1327,34 +1060,6 @@ func redhat128ProviderWithLabels(t *testing.T) *framework.CloudStack { } // Multicluster -func TestCloudStackKubernetes124MulticlusterWorkloadCluster(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewMulticlusterE2ETest( - t, - framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), - api.WithControlPlaneCount(1), - api.WithWorkerNodeCount(1), - api.WithStackedEtcdTopology(), - ), - ), - framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), - api.WithControlPlaneCount(1), - api.WithWorkerNodeCount(1), - api.WithStackedEtcdTopology(), - ), - ), - ) - runWorkloadClusterFlow(test) -} - func TestCloudStackKubernetes125MulticlusterWorkloadCluster(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewMulticlusterE2ETest( @@ -1467,39 +1172,8 @@ func TestCloudStackKubernetes128MulticlusterWorkloadCluster(t *testing.T) { runWorkloadClusterFlow(test) } -// WL cluster with prev release version from management cluster -func TestCloudStackKubernetes124MulticlusterWorkloadClusterPrevVersion(t *testing.T) { - prevLatestRel := prevLatestMinorRelease(t) - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewMulticlusterE2ETest( - t, - framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), - api.WithControlPlaneCount(1), - api.WithWorkerNodeCount(1), - api.WithStackedEtcdTopology(), - ), - ), - framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), - api.WithControlPlaneCount(1), - api.WithWorkerNodeCount(1), - api.WithStackedEtcdTopology(), - ), - ), - ) - runWorkloadClusterPrevVersionCreateFlow(test, prevLatestRel) -} - -// TODO: Add TestCloudStackUpgradeKubernetes124MulticlusterWorkloadClusterWithGithubFlux func TestCloudStackUpgradeKubernetes125MulticlusterWorkloadClusterWithGithubFlux(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) + provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewMulticlusterE2ETest( t, framework.NewClusterE2ETest( @@ -1507,7 +1181,7 @@ func TestCloudStackUpgradeKubernetes125MulticlusterWorkloadClusterWithGithubFlux provider, framework.WithFluxGithub(), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), @@ -1518,7 +1192,7 @@ func TestCloudStackUpgradeKubernetes125MulticlusterWorkloadClusterWithGithubFlux provider, framework.WithFluxGithub(), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), @@ -1528,12 +1202,12 @@ func TestCloudStackUpgradeKubernetes125MulticlusterWorkloadClusterWithGithubFlux runWorkloadClusterFlowWithGitOps( test, framework.WithClusterUpgradeGit( - api.WithKubernetesVersion(v1alpha1.Kube125), + api.WithKubernetesVersion(v1alpha1.Kube126), api.WithControlPlaneCount(3), api.WithWorkerNodeCount(3), ), provider.WithProviderUpgradeGit( - provider.Redhat125Template(), + provider.Redhat126Template(), ), ) } @@ -1658,11 +1332,6 @@ func TestCloudStackUpgradeKubernetes128MulticlusterWorkloadClusterWithGithubFlux ) } -func TestCloudStackKubernetes124WithOIDCManagementClusterUpgradeFromLatestSideEffects(t *testing.T) { - cloudstack := framework.NewCloudStack(t) - runTestManagementClusterUpgradeSideEffects(t, cloudstack, framework.RedHat8, anywherev1.Kube124) -} - func TestCloudStackKubernetes125WithOIDCManagementClusterUpgradeFromLatestSideEffects(t *testing.T) { cloudstack := framework.NewCloudStack(t) runTestManagementClusterUpgradeSideEffects(t, cloudstack, framework.RedHat8, anywherev1.Kube125) @@ -1684,23 +1353,10 @@ func TestCloudStackKubernetes128WithOIDCManagementClusterUpgradeFromLatestSideEf } // OIDC -func TestCloudStackKubernetes124OIDC(t *testing.T) { +func TestCloudStackKubernetes125OIDC(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithOIDC(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runOIDCFlow(test) -} - -func TestCloudStackKubernetes125OIDC(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat125()), + framework.NewCloudStack(t, framework.WithCloudStackRedhat125()), framework.WithOIDC(), framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube125)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), @@ -1749,26 +1405,6 @@ func TestCloudStackKubernetes128OIDC(t *testing.T) { runOIDCFlow(test) } -// TODO: Add TestCloudStackKubernetes123To124OIDCUpgrade -func TestCloudStackKubernetes124To125OIDCUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithOIDC(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runUpgradeFlowWithOIDC( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(provider.Redhat125Template()), - ) -} - func TestCloudStackKubernetes125To126OIDCUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest( @@ -1808,19 +1444,6 @@ func TestCloudStackKubernetes126To127OIDCUpgrade(t *testing.T) { } // Proxy config -func TestCloudStackKubernetes124RedhatProxyConfig(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithProxy(framework.CloudstackProxyRequiredEnvVars), - ) - runProxyConfigFlow(test) -} - func TestCloudStackKubernetes125RedhatProxyConfig(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1874,50 +1497,6 @@ func TestCloudStackKubernetes128RedhatProxyConfig(t *testing.T) { } // Proxy config multicluster -func TestCloudStackKubernetes124RedhatProxyConfigAPI(t *testing.T) { - cloudstack := framework.NewCloudStack(t) - managementCluster := framework.NewClusterE2ETest( - t, - cloudstack, - ).WithClusterConfig( - api.ClusterToConfigFiller( - api.WithControlPlaneCount(1), - api.WithWorkerNodeCount(1), - ), - cloudstack.WithRedhat124(), - ) - - 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.WithRedhat124(), - ), - ) - - 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() -} - func TestCloudStackKubernetes125RedhatProxyConfigAPI(t *testing.T) { cloudstack := framework.NewCloudStack(t) managementCluster := framework.NewClusterE2ETest( @@ -2095,19 +1674,6 @@ func TestCloudStackKubernetes128RedhatProxyConfigAPI(t *testing.T) { } // Registry mirror -func TestCloudStackKubernetes124RedhatRegistryMirrorInsecureSkipVerify(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithRegistryMirrorInsecureSkipVerify(constants.CloudStackProviderName), - ) - runRegistryMirrorConfigFlow(test) -} - func TestCloudStackKubernetes125RedhatRegistryMirrorInsecureSkipVerify(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -2160,19 +1726,6 @@ func TestCloudStackKubernetes128RedhatRegistryMirrorInsecureSkipVerify(t *testin runRegistryMirrorConfigFlow(test) } -func TestCloudStackKubernetes124RedhatRegistryMirrorAndCert(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithRegistryMirrorEndpointAndCert(constants.CloudStackProviderName), - ) - runRegistryMirrorConfigFlow(test) -} - func TestCloudStackKubernetes125RedhatRegistryMirrorAndCert(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -2225,19 +1778,6 @@ func TestCloudStackKubernetes128RedhatRegistryMirrorAndCert(t *testing.T) { runRegistryMirrorConfigFlow(test) } -func TestCloudStackKubernetes124RedhatAuthenticatedRegistryMirror(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithAuthenticatedRegistryMirror(constants.CloudStackProviderName), - ) - runRegistryMirrorConfigFlow(test) -} - func TestCloudStackKubernetes125RedhatAuthenticatedRegistryMirror(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -2291,15 +1831,6 @@ func TestCloudStackKubernetes128RedhatAuthenticatedRegistryMirror(t *testing.T) } // Simpleflow -func TestCloudStackKubernetes124SimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleFlow(test) -} - func TestCloudStackKubernetes125SimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -2336,17 +1867,6 @@ func TestCloudStackKubernetes128SimpleFlow(t *testing.T) { runSimpleFlow(test) } -func TestCloudStackKubernetes124ThreeReplicasFiveWorkersSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(3)), - framework.WithClusterFiller(api.WithWorkerNodeCount(5)), - ) - runSimpleFlow(test) -} - func TestCloudStackKubernetes125ThreeReplicasFiveWorkersSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -2391,16 +1911,6 @@ func TestCloudStackKubernetes128ThreeReplicasFiveWorkersSimpleFlow(t *testing.T) runSimpleFlow(test) } -func TestCloudStackKubernetes124MultiEndpointSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124(), - framework.WithCloudStackFillers(framework.UpdateAddCloudStackAz2())), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleFlow(test) -} - func TestCloudStackKubernetes125MultiEndpointSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -2441,18 +1951,6 @@ func TestCloudStackKubernetes128MultiEndpointSimpleFlow(t *testing.T) { runSimpleFlow(test) } -func TestCloudStackKubernetes124DifferentNamespaceSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124(), - framework.WithCloudStackFillers(api.WithCloudStackConfigNamespace(clusterNamespace), - api.WithCloudStackConfigNamespaceForAllMachinesAndDatacenter(clusterNamespace))), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithClusterNamespace(clusterNamespace)), - ) - runSimpleFlow(test) -} - func TestCloudStackKubernetes125DifferentNamespaceSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -2502,16 +2000,6 @@ func TestCloudStackKubernetes128DifferentNamespaceSimpleFlow(t *testing.T) { } // Cilium Policy -func TestCloudStackKubernetes124CiliumAlwaysPolicyEnforcementModeSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways)), - ) - runSimpleFlow(test) -} - func TestCloudStackKubernetes125CiliumAlwaysPolicyEnforcementModeSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -2552,26 +2040,6 @@ func TestCloudStackKubernetes128CiliumAlwaysPolicyEnforcementModeSimpleFlow(t *t runSimpleFlow(test) } -// TODO: Add TestCloudStackKubernetes123RedhatTo124UpgradeCiliumPolicyEnforcementMode -func TestCloudStackKubernetes124RedhatTo125UpgradeCiliumPolicyEnforcementMode(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - framework.WithClusterFiller(api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways)), - provider.WithProviderUpgrade(provider.Redhat125Template()), - ) -} - func TestCloudStackKubernetes125RedhatTo126UpgradeCiliumPolicyEnforcementMode(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest( @@ -2611,15 +2079,6 @@ func TestCloudStackKubernetes126RedhatTo127UpgradeCiliumPolicyEnforcementMode(t } // Stacked etcd -func TestCloudStackKubernetes124StackedEtcdRedhat(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewCloudStack(t, framework.WithCloudStackRedhat124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithStackedEtcdTopology())) - runStackedEtcdFlow(test) -} - func TestCloudStackKubernetes125StackedEtcdRedhat(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewCloudStack(t, framework.WithCloudStackRedhat125()), @@ -2657,32 +2116,6 @@ func TestCloudStackKubernetes128StackedEtcdRedhat(t *testing.T) { } // Taints -func TestCloudStackKubernetes124RedhatTaintsUpgradeFlow(t *testing.T) { - provider := redhat124ProviderWithTaints(t) - - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), - api.WithExternalEtcdTopology(1), - api.WithControlPlaneCount(1), - api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate - ), - ) - - runTaintsUpgradeFlow( - test, - v1alpha1.Kube124, - 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 TestCloudStackKubernetes125RedhatTaintsUpgradeFlow(t *testing.T) { provider := redhat125ProviderWithTaints(t) @@ -2787,24 +2220,6 @@ func TestCloudStackKubernetes128RedhatTaintsUpgradeFlow(t *testing.T) { ) } -func redhat124ProviderWithTaints(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.WithCloudStackRedhat124(), - ) -} - func redhat125ProviderWithTaints(t *testing.T) *framework.CloudStack { return framework.NewCloudStack(t, framework.WithCloudStackWorkerNodeGroup( @@ -2878,46 +2293,6 @@ func redhat128ProviderWithTaints(t *testing.T) *framework.CloudStack { } // Upgrade -func TestCloudStackKubernetes124RedhatAndRemoveWorkerNodeGroups(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.WithCloudStackRedhat124(), - ) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), - api.WithExternalEtcdTopology(1), - api.WithControlPlaneCount(1), - api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate - ), - ) - - runSimpleUpgradeFlow( - test, - v1alpha1.Kube124, - framework.WithClusterUpgrade( - api.RemoveWorkerNodeGroup("workers-2"), - api.WithWorkerNodeGroup("workers-1", api.WithCount(1)), - ), - provider.WithNewCloudStackWorkerNodeGroup( - "worker-1", - framework.WithWorkerNodeGroup( - "workers-3", - api.WithCount(1), - ), - ), - ) -} - func TestCloudStackKubernetes125RedhatAndRemoveWorkerNodeGroups(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackWorkerNodeGroup( @@ -3078,25 +2453,6 @@ func TestCloudStackKubernetes128RedhatAndRemoveWorkerNodeGroups(t *testing.T) { ) } -// TODO: 1.23 to 1.24 upgrade tests -func TestCloudStackKubernetes124To125RedhatUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithStackedEtcdTopology()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube125, - framework.WithClusterFiller(api.WithStackedEtcdTopology()), - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(provider.Redhat125Template()), - ) -} - func TestCloudStackKubernetes125To126RedhatUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest( @@ -3151,23 +2507,6 @@ func TestCloudStackKubernetes127To128RedhatUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes124To125RedhatUnstackedUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(provider.Redhat125Template()), - ) -} - func TestCloudStackKubernetes125To126RedhatUnstackedUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest( @@ -3219,24 +2558,6 @@ func TestCloudStackKubernetes127To128RedhatUnstackedUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes124RedhatTo125StackedEtcdUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithClusterFiller(api.WithStackedEtcdTopology()), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(provider.Redhat125Template()), - ) -} - func TestCloudStackKubernetes125RedhatTo126StackedEtcdUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest( @@ -3292,36 +2613,6 @@ func TestCloudStackKubernetes127RedhatTo128StackedEtcdUpgrade(t *testing.T) { } // 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) -func TestCloudStackKubernetes124RedhatTo125UpgradeWithCheckpoint(t *testing.T) { - var clusterOpts []framework.ClusterE2ETestOpt - var clusterOpts2 []framework.ClusterE2ETestOpt - - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - - clusterOpts = append(clusterOpts, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), framework.ExpectFailure(true), - provider.WithProviderUpgrade(provider.Redhat124Template()), framework.WithEnvVar(features.CheckpointEnabledEnvVar, "true"), framework.WithEnvVar(framework.CleanupVmsVar, "false")) - - commandOpts := []framework.CommandOpt{framework.WithExternalEtcdWaitTimeout("10m")} - - clusterOpts2 = append(clusterOpts, framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), framework.ExpectFailure(false), - provider.WithProviderUpgrade(provider.Redhat125Template()), framework.WithEnvVar(features.CheckpointEnabledEnvVar, "true"), framework.WithEnvVar(framework.CleanupVmsVar, "true")) - - runUpgradeFlowWithCheckpoint( - test, - v1alpha1.Kube125, - clusterOpts, - clusterOpts2, - commandOpts, - ) -} - func TestCloudStackKubernetes125RedhatTo126UpgradeWithCheckpoint(t *testing.T) { var clusterOpts []framework.ClusterE2ETestOpt var clusterOpts2 []framework.ClusterE2ETestOpt @@ -3412,44 +2703,6 @@ func TestCloudStackKubernetes127RedhatTo128UpgradeWithCheckpoint(t *testing.T) { ) } -func TestCloudStackKubernetes124RedhatUpgradeFromLatestMinorReleaseAlwaysNetworkPolicy(t *testing.T) { - release := latestMinorRelease(t) - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runUpgradeFromReleaseFlow( - test, - release, - v1alpha1.Kube124, - framework.WithClusterFiller(api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways)), - provider.WithProviderUpgrade( - provider.Redhat124Template(), // Set the template so it doesn't get autoimported - ), - ) -} - -func TestCloudStackKubernetes124RedhatControlPlaneNodeUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube124, - framework.WithClusterUpgrade(api.WithControlPlaneCount(3)), - ) -} - func TestCloudStackKubernetes125RedhatControlPlaneNodeUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest( @@ -3514,22 +2767,6 @@ func TestCloudStackKubernetes128RedhatControlPlaneNodeUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes124RedhatWorkerNodeUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube124, - framework.WithClusterUpgrade(api.WithWorkerNodeCount(5)), - ) -} - func TestCloudStackKubernetes125RedhatWorkerNodeUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest( @@ -3594,45 +2831,6 @@ func TestCloudStackKubernetes128RedhatWorkerNodeUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes124UpgradeFromLatestMinorRelease(t *testing.T) { - release := latestMinorRelease(t) - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runUpgradeFromReleaseFlow( - test, - release, - v1alpha1.Kube124, - provider.WithProviderUpgrade(), - ) -} - -// TODO: More 1.23 to 1.24 Upgrade tests -func TestCloudStackKubernetes124To125RedhatMultipleFieldsUpgrade(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - provider.WithProviderUpgrade( - provider.Redhat125Template(), - framework.UpdateLargerCloudStackComputeOffering(), - ), - ) -} - func TestCloudStackKubernetes125To126RedhatMultipleFieldsUpgrade(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat125()) test := framework.NewClusterE2ETest( @@ -3690,56 +2888,7 @@ func TestCloudStackKubernetes127To128RedhatMultipleFieldsUpgrade(t *testing.T) { ) } -func TestCloudStackKubernetes124AddRemoveAz(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - test.GenerateClusterConfig() - test.CreateCluster() - test.UpgradeClusterWithNewConfig([]framework.ClusterE2ETestOpt{ - provider.WithProviderUpgrade( - framework.UpdateAddCloudStackAz2(), - ), - }) - test.StopIfFailed() - test.UpgradeClusterWithNewConfig([]framework.ClusterE2ETestOpt{ - provider.WithProviderUpgrade( - framework.RemoveAllCloudStackAzs(), - framework.UpdateAddCloudStackAz1(), - ), - }) - test.StopIfFailed() - test.DeleteCluster() -} - // This test is skipped as registry mirror was not configured for CloudStack -func TestCloudStackKubernetes124RedhatAirgappedRegistryMirror(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewCloudStack(t, - framework.WithCloudStackRedhat124(), - framework.WithCloudStackFillers( - framework.RemoveAllCloudStackAzs(), - framework.UpdateAddCloudStackAz3(), - ), - ), - framework.WithClusterFiller( - api.WithStackedEtcdTopology(), - api.WithControlPlaneCount(1), - 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.Kube124)), - framework.WithRegistryMirrorEndpointAndCert(constants.CloudStackProviderName), - ) - runAirgapConfigFlow(test, "10.0.0.1/8") -} - func TestCloudStackKubernetes125RedhatAirgappedRegistryMirror(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -3785,32 +2934,6 @@ func TestCloudStackKubernetes126RedhatAirgappedRegistryMirror(t *testing.T) { } // Workload API -func TestCloudStackKubernetes124RedHatAPI(t *testing.T) { - cloudstack := framework.NewCloudStack(t) - test := framework.NewClusterE2ETest( - t, cloudstack, - ).WithClusterConfig( - api.ClusterToConfigFiller( - api.WithStackedEtcdTopology(), - api.WithControlPlaneCount(1), - api.WithWorkerNodeCount(1), - ), - cloudstack.WithRedhat124(), - ) - - test.CreateCluster() - test.LoadClusterConfigGeneratedByCLI() - // Run mgmt cluster API tests - tests := cloudstackAPIManagementClusterUpgradeTests(test, cloudstack) - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - runCloudStackAPIUpgradeTest(t, test, tt) - }) - } - test.StopIfFailed() - test.DeleteCluster() -} - func TestCloudStackMulticlusterWorkloadClusterAPI(t *testing.T) { cloudstack := framework.NewCloudStack(t) managementCluster := framework.NewClusterE2ETest( @@ -3821,7 +2944,7 @@ func TestCloudStackMulticlusterWorkloadClusterAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), ) test := framework.NewMulticlusterE2ETest(t, managementCluster) @@ -3836,7 +2959,7 @@ func TestCloudStackMulticlusterWorkloadClusterAPI(t *testing.T) { api.WithStackedEtcdTopology(), api.WithControlPlaneCount(1), ), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), ), ) @@ -3851,7 +2974,7 @@ func TestCloudStackMulticlusterWorkloadClusterAPI(t *testing.T) { api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), ), - cloudstack.WithRedhat125(), + cloudstack.WithRedhat126(), ), ) @@ -3907,7 +3030,7 @@ func TestCloudStackMulticlusterWorkloadClusterNewCredentialsSecretsAPI(t *testin api.CloudStackToConfigFiller( api.WithCloudStackCredentialsRef("test-creds"), ), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), )) test.WithWorkloadClusters(framework.NewClusterE2ETest( @@ -3923,7 +3046,7 @@ func TestCloudStackMulticlusterWorkloadClusterNewCredentialsSecretsAPI(t *testin api.CloudStackToConfigFiller( api.WithCloudStackCredentialsRef("test-creds"), ), - cloudstack.WithRedhat125(), + cloudstack.WithRedhat126(), )) test.CreateManagementCluster() @@ -3942,83 +3065,7 @@ func TestCloudStackMulticlusterWorkloadClusterNewCredentialsSecretsAPI(t *testin test.DeleteManagementCluster() } -func TestCloudStackKubernetesRedHat124To125UpgradeFromLatestMinorReleaseAPI(t *testing.T) { - release := latestMinorRelease(t) - cloudstack := framework.NewCloudStack(t) - managementCluster := framework.NewClusterE2ETest( - t, - cloudstack, - ) - managementCluster.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release)) - managementCluster.UpdateClusterConfig( - cloudstack.WithKubeVersionAndOS(v1alpha1.Kube124, framework.RedHat8, release), - ) - test := framework.NewMulticlusterE2ETest(t, managementCluster) - wc := framework.NewClusterE2ETest( - t, - cloudstack, - framework.WithClusterName(test.NewWorkloadClusterName()), - ) - wc.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release)) - wc.UpdateClusterConfig( - api.ClusterToConfigFiller( - api.WithManagementCluster(managementCluster.ClusterName), - ), - cloudstack.WithKubeVersionAndOS(v1alpha1.Kube124, framework.RedHat8, release), - ) - test.WithWorkloadClusters(wc) - - runMulticlusterUpgradeFromReleaseFlowAPI( - test, - release, - v1alpha1.Kube125, - framework.RedHat8, - ) -} - // Workload GitOps API -func TestCloudStackKubernetesRedHat124to125UpgradeFromLatestMinorReleaseGitHubFluxAPI(t *testing.T) { - release := latestMinorRelease(t) - cloudstack := framework.NewCloudStack(t) - managementCluster := framework.NewClusterE2ETest( - t, - cloudstack, - - framework.WithFluxGithubEnvVarCheck(), - framework.WithFluxGithubCleanup(), - ) - managementCluster.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release)) - managementCluster.UpdateClusterConfig( - cloudstack.WithKubeVersionAndOS(v1alpha1.Kube124, framework.RedHat8, release), - framework.WithFluxGithubConfig(), - ) - test := framework.NewMulticlusterE2ETest(t, managementCluster) - wc := framework.NewClusterE2ETest( - t, - cloudstack, - framework.WithClusterName(test.NewWorkloadClusterName()), - - framework.WithFluxGithubEnvVarCheck(), - framework.WithFluxGithubCleanup(), - ) - wc.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release)) - wc.UpdateClusterConfig( - api.ClusterToConfigFiller( - api.WithManagementCluster(managementCluster.ClusterName), - ), - cloudstack.WithKubeVersionAndOS(v1alpha1.Kube124, framework.RedHat8, release), - framework.WithFluxGithubConfig(), - ) - test.WithWorkloadClusters(wc) - - runMulticlusterUpgradeFromReleaseFlowAPIWithFlux( - test, - release, - v1alpha1.Kube125, - framework.RedHat8, - ) -} - func TestCloudStackMulticlusterWorkloadClusterGitHubFluxAPI(t *testing.T) { cloudstack := framework.NewCloudStack(t) managementCluster := framework.NewClusterE2ETest( @@ -4033,7 +3080,7 @@ func TestCloudStackMulticlusterWorkloadClusterGitHubFluxAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), framework.WithFluxGithubConfig(), ) @@ -4049,7 +3096,7 @@ func TestCloudStackMulticlusterWorkloadClusterGitHubFluxAPI(t *testing.T) { api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), ), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), ), ) @@ -4064,7 +3111,7 @@ func TestCloudStackMulticlusterWorkloadClusterGitHubFluxAPI(t *testing.T) { api.WithStackedEtcdTopology(), api.WithControlPlaneCount(1), ), - cloudstack.WithRedhat125(), + cloudstack.WithRedhat126(), ), ) @@ -4124,7 +3171,7 @@ func TestCloudStackMulticlusterWorkloadClusterNewCredentialsSecretGitHubFluxAPI( api.CloudStackToConfigFiller( api.WithCloudStackCredentialsRef("test-creds"), ), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), )) test.WithWorkloadClusters(framework.NewClusterE2ETest( @@ -4140,7 +3187,7 @@ func TestCloudStackMulticlusterWorkloadClusterNewCredentialsSecretGitHubFluxAPI( api.CloudStackToConfigFiller( api.WithCloudStackCredentialsRef("test-creds"), ), - cloudstack.WithRedhat125(), + cloudstack.WithRedhat126(), )) test.CreateManagementCluster() @@ -4186,7 +3233,7 @@ func TestCloudStackWorkloadClusterAWSIamAuthAPI(t *testing.T) { api.WithStackedEtcdTopology(), ), framework.WithAwsIamConfig(), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), ), ) @@ -4221,7 +3268,7 @@ func TestCloudStackWorkloadClusterAWSIamAuthGithubFluxAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), framework.WithFluxGithubConfig(), ) @@ -4239,7 +3286,7 @@ func TestCloudStackWorkloadClusterAWSIamAuthGithubFluxAPI(t *testing.T) { api.WithStackedEtcdTopology(), ), framework.WithAwsIamConfig(), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), ), ) @@ -4287,7 +3334,7 @@ func TestCloudStackWorkloadClusterOIDCAuthAPI(t *testing.T) { api.WithStackedEtcdTopology(), ), framework.WithOIDCClusterConfig(t), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), ), ) @@ -4322,7 +3369,7 @@ func TestCloudStackWorkloadClusterOIDCAuthGithubFluxAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), framework.WithFluxGithubConfig(), ) @@ -4340,7 +3387,7 @@ func TestCloudStackWorkloadClusterOIDCAuthGithubFluxAPI(t *testing.T) { api.WithStackedEtcdTopology(), ), framework.WithOIDCClusterConfig(t), - cloudstack.WithRedhat124(), + cloudstack.WithRedhat125(), ), ) @@ -4361,28 +3408,6 @@ func TestCloudStackWorkloadClusterOIDCAuthGithubFluxAPI(t *testing.T) { test.DeleteManagementCluster() } -func TestCloudStackKubernetes124EtcdEncryption(t *testing.T) { - provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), - api.WithExternalEtcdTopology(1), - api.WithControlPlaneCount(1), - ), - framework.WithPodIamConfig(), - ) - test.OSFamily = v1alpha1.RedHat - test.GenerateClusterConfig() - test.CreateCluster() - test.PostClusterCreateEtcdEncryptionSetup() - test.UpgradeClusterWithNewConfig([]framework.ClusterE2ETestOpt{framework.WithEtcdEncrytion()}) - test.StopIfFailed() - test.ValidateEtcdEncryption() - test.DeleteCluster() -} - func TestCloudstackKubernetes127To128RedHatManagementCPUpgradeAPI(t *testing.T) { provider := framework.NewCloudStack(t, framework.WithCloudStackRedhat127()) test := framework.NewClusterE2ETest( diff --git a/test/e2e/conformance_test.go b/test/e2e/conformance_test.go index b52959776476..3395b471beee 100644 --- a/test/e2e/conformance_test.go +++ b/test/e2e/conformance_test.go @@ -30,16 +30,6 @@ func runTinkerbellConformanceFlow(test *framework.ClusterE2ETest) { test.ValidateHardwareDecommissioned() } -func TestDockerKubernetes124ThreeWorkersConformanceFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewDocker(t), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - ) - runConformanceFlow(test) -} - func TestDockerKubernetes125ThreeWorkersConformanceFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -60,16 +50,6 @@ func TestDockerKubernetes126ThreeWorkersConformanceFlow(t *testing.T) { runConformanceFlow(test) } -func TestVSphereKubernetes124ThreeWorkersConformanceFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - ) - runConformanceFlow(test) -} - func TestVSphereKubernetes125ThreeWorkersConformanceFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -90,16 +70,6 @@ func TestVSphereKubernetes126ThreeWorkersConformanceFlow(t *testing.T) { runConformanceFlow(test) } -func TestVSphereKubernetes124BottleRocketThreeWorkersConformanceFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewVSphere(t, framework.WithBottleRocket124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - ) - runConformanceFlow(test) -} - func TestVSphereKubernetes125BottleRocketThreeWorkersConformanceFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -120,19 +90,6 @@ func TestVSphereKubernetes126BottleRocketThreeWorkersConformanceFlow(t *testing. runConformanceFlow(test) } -func TestTinkerbellKubernetes124ThreeReplicasTwoWorkersConformanceFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewTinkerbell(t, framework.WithUbuntu124Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithWorkerNodeCount(2)), - framework.WithClusterFiller(api.WithControlPlaneCount(3)), - framework.WithControlPlaneHardware(3), - framework.WithWorkerHardware(2), - ) - runTinkerbellConformanceFlow(test) -} - func TestTinkerbellKubernetes125ThreeReplicasTwoWorkersConformanceFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -159,19 +116,6 @@ func TestTinkerbellKubernetes126ThreeReplicasTwoWorkersConformanceFlow(t *testin runTinkerbellConformanceFlow(test) } -func TestTinkerbellKubernetes124BottleRocketThreeReplicasTwoWorkersConformanceFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewTinkerbell(t, framework.WithBottleRocketTinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithWorkerNodeCount(2)), - framework.WithClusterFiller(api.WithControlPlaneCount(3)), - framework.WithControlPlaneHardware(3), - framework.WithWorkerHardware(2), - ) - runTinkerbellConformanceFlow(test) -} - func TestTinkerbellKubernetes125BottleRocketThreeReplicasTwoWorkersConformanceFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -198,16 +142,6 @@ func TestTinkerbellKubernetes126BottleRocketThreeReplicasTwoWorkersConformanceFl runTinkerbellConformanceFlow(test) } -func TestNutanixKubernetes124ThreeWorkersConformanceFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewNutanix(t, framework.WithUbuntu124Nutanix()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - ) - runConformanceFlow(test) -} - func TestNutanixKubernetes125ThreeWorkersConformanceFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, diff --git a/test/e2e/docker_test.go b/test/e2e/docker_test.go index 8a4df11cef92..1bc92b227bca 100644 --- a/test/e2e/docker_test.go +++ b/test/e2e/docker_test.go @@ -94,18 +94,6 @@ func TestDockerInstallGithubFluxDuringUpgrade(t *testing.T) { ) } -func TestDockerKubernetes124CuratedPackagesSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewDocker(t), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageInstallSimpleFlow(test) -} - func TestDockerKubernetes125CuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -154,18 +142,6 @@ func TestDockerKubernetes128CuratedPackagesSimpleFlow(t *testing.T) { runCuratedPackageInstallSimpleFlow(test) } -func TestDockerKubernetes124CuratedPackagesEmissarySimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewDocker(t), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageEmissaryInstallSimpleFlow(test) -} - func TestDockerKubernetes125CuratedPackagesEmissarySimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -214,18 +190,6 @@ func TestDockerKubernetes128CuratedPackagesEmissarySimpleFlow(t *testing.T) { runCuratedPackageEmissaryInstallSimpleFlow(test) } -func TestDockerKubernetes124CuratedPackagesHarborSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewDocker(t), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) -} - func TestDockerKubernetes125CuratedPackagesHarborSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -274,17 +238,6 @@ func TestDockerKubernetes128CuratedPackagesHarborSimpleFlow(t *testing.T) { runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) } -func TestDockerKubernetes124CuratedPackagesAdotSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, framework.NewDocker(t), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesAdotInstallSimpleFlow(test) // other args as necessary -} - func TestDockerKubernetes125CuratedPackagesAdotSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, framework.NewDocker(t), @@ -329,17 +282,6 @@ func TestDockerKubernetes128CuratedPackagesAdotSimpleFlow(t *testing.T) { runCuratedPackagesAdotInstallSimpleFlow(test) // other args as necessary } -func TestDockerKubernetes124CuratedPackagesPrometheusSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, framework.NewDocker(t), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesPrometheusInstallSimpleFlow(test) -} - func TestDockerKubernetes125CuratedPackagesPrometheusSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, framework.NewDocker(t), @@ -384,18 +326,6 @@ func TestDockerKubernetes128CuratedPackagesPrometheusSimpleFlow(t *testing.T) { runCuratedPackagesPrometheusInstallSimpleFlow(test) } -func TestDockerKubernetes124CuratedPackagesDisabled(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, framework.NewDocker(t), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, - &v1alpha1.PackageConfiguration{Disable: true}), - ) - runDisabledCuratedPackageInstallSimpleFlow(test) // other args as necessary -} - func TestDockerKubernetes125CuratedPackagesDisabled(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, framework.NewDocker(t), @@ -437,15 +367,6 @@ func TestDockerCuratedPackagesMetalLB(t *testing.T) { } // AWS IAM Auth -func TestDockerKubernetes124AWSIamAuth(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewDocker(t), - framework.WithAWSIam(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runAWSIamAuthFlow(test) -} - func TestDockerKubernetes125AWSIamAuth(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewDocker(t), @@ -492,7 +413,7 @@ func TestDockerUpgradeWorkloadClusterWithGithubFlux(t *testing.T) { provider, framework.WithFluxGithub(), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), ), @@ -502,7 +423,7 @@ func TestDockerUpgradeWorkloadClusterWithGithubFlux(t *testing.T) { provider, framework.WithFluxGithub(), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), ), @@ -511,7 +432,7 @@ func TestDockerUpgradeWorkloadClusterWithGithubFlux(t *testing.T) { runWorkloadClusterFlowWithGitOps( test, framework.WithClusterUpgradeGit( - api.WithKubernetesVersion(v1alpha1.Kube125), + api.WithKubernetesVersion(v1alpha1.Kube126), api.WithControlPlaneCount(2), api.WithWorkerNodeCount(2), ), @@ -522,15 +443,6 @@ func TestDockerUpgradeWorkloadClusterWithGithubFlux(t *testing.T) { } // OIDC -func TestDockerKubernetes124OIDC(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewDocker(t), - framework.WithOIDC(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runOIDCFlow(test) -} - func TestDockerKubernetes125OIDC(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewDocker(t), @@ -618,15 +530,6 @@ func TestDockerKubernetes127RegistryMirrorInsecureSkipVerify(t *testing.T) { } // Simple flow -func TestDockerKubernetes124SimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewDocker(t), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleFlow(test) -} - func TestDockerKubernetes125SimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -732,43 +635,6 @@ func TestDockerKubernetes127To128ExternalEtcdUpgrade(t *testing.T) { ) } -func TestDockerKubernetes124UpgradeFromLatestMinorRelease(t *testing.T) { - release := latestMinorRelease(t) - provider := framework.NewDocker(t) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runUpgradeFromReleaseFlow( - test, - release, - v1alpha1.Kube124, - ) -} - -func TestDockerKubernetes124to125UpgradeFromLatestMinorRelease(t *testing.T) { - release := latestMinorRelease(t) - provider := framework.NewDocker(t) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runUpgradeFromReleaseFlow( - test, - release, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - ) -} - func TestDockerKubernetes125to126UpgradeFromLatestMinorRelease(t *testing.T) { release := latestMinorRelease(t) provider := framework.NewDocker(t) @@ -1078,7 +944,7 @@ func TestDockerUpgradeWorkloadClusterLabelsAndTaintsGitHubFluxAPI(t *testing.T) t, provider, framework.WithFluxGithubEnvVarCheck(), framework.WithFluxGithubCleanup(), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithExternalEtcdTopology(1), @@ -1091,7 +957,7 @@ func TestDockerUpgradeWorkloadClusterLabelsAndTaintsGitHubFluxAPI(t *testing.T) t, provider, framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), api.WithManagementCluster(managementCluster.ClusterName), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -1121,7 +987,7 @@ func TestDockerUpgradeWorkloadClusterScaleAddRemoveWorkerNodeGroupsGitHubFluxAPI t, provider, framework.WithFluxGithubEnvVarCheck(), framework.WithFluxGithubCleanup(), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithExternalEtcdTopology(1), @@ -1137,7 +1003,7 @@ func TestDockerUpgradeWorkloadClusterScaleAddRemoveWorkerNodeGroupsGitHubFluxAPI t, provider, framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), api.WithManagementCluster(managementCluster.ClusterName), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate diff --git a/test/e2e/nutanix_test.go b/test/e2e/nutanix_test.go index 2ea1b6756432..a0bce661e029 100644 --- a/test/e2e/nutanix_test.go +++ b/test/e2e/nutanix_test.go @@ -229,78 +229,6 @@ func TestNutanixKubernetes125UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t runAutoscalerWithMetricsServerSimpleFlow(test) } -func TestNutanixKubernetes124UbuntuCuratedPackagesSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewNutanix(t, framework.WithUbuntu124Nutanix()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageInstallSimpleFlow(test) -} - -func TestNutanixKubernetes124UbuntuCuratedPackagesEmissarySimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewNutanix(t, framework.WithUbuntu124Nutanix()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageEmissaryInstallSimpleFlow(test) -} - -func TestNutanixKubernetes124UbuntuCuratedPackagesHarborSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewNutanix(t, framework.WithUbuntu124Nutanix()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) -} - -func TestNutanixKubernetes124UbuntuCuratedPackagesAdotSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewNutanix(t, framework.WithUbuntu124Nutanix()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesAdotInstallSimpleFlow(test) -} - -func TestNutanixKubernetes124UbuntuCuratedPackagesPrometheusSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewNutanix(t, framework.WithUbuntu124Nutanix()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesPrometheusInstallSimpleFlow(test) -} - -func TestNutanixKubernetes124UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { - minNodes := 1 - maxNodes := 2 - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewNutanix(t, framework.WithUbuntu124Nutanix()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runAutoscalerWithMetricsServerSimpleFlow(test) -} - func TestNutanixKubernetes128UbuntuCuratedPackagesSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewNutanix(t, framework.WithUbuntu128Nutanix()), @@ -383,15 +311,6 @@ func TestNutanixKubernetes128SimpleFlowWithName(t *testing.T) { runSimpleFlow(test) } -func TestNutanixKubernetes124SimpleFlowWithName(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewNutanix(t, framework.WithUbuntu124Nutanix()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleFlow(test) -} - func TestNutanixKubernetes125SimpleFlowWithName(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -428,15 +347,6 @@ func TestNutanixKubernetes128RedHatSimpleFlowWithName(t *testing.T) { runSimpleFlow(test) } -func TestNutanixKubernetes124RedHatSimpleFlowWithName(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewNutanix(t, framework.WithRedHat124Nutanix()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleFlow(test) -} - func TestNutanixKubernetes125RedHatSimpleFlowWithName(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -473,15 +383,6 @@ func TestNutanixKubernetes128RedHat9SimpleFlowWithName(t *testing.T) { runSimpleFlow(test) } -func TestNutanixKubernetes124RedHat9SimpleFlowWithName(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewNutanix(t, framework.WithRedHat9Kubernetes124Nutanix()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleFlow(test) -} - func TestNutanixKubernetes125RedHat9SimpleFlowWithName(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -520,17 +421,6 @@ func TestNutanixKubernetes128SimpleFlowWithUUID(t *testing.T) { runSimpleFlow(test) } -func TestNutanixKubernetes124SimpleFlowWithUUID(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewNutanix(t, framework.WithUbuntu124NutanixUUID(), - framework.WithPrismElementClusterUUID(), - framework.WithNutanixSubnetUUID()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleFlow(test) -} - func TestNutanixKubernetes125SimpleFlowWithUUID(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -602,23 +492,6 @@ func TestNutanixKubernetes127To128UbuntuUpgrade(t *testing.T) { ) } -func TestNutanixKubernetes124To125UbuntuUpgrade(t *testing.T) { - provider := framework.NewNutanix(t, framework.WithUbuntu124Nutanix()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(provider.Ubuntu125Template()), - ) -} - func TestNutanixKubernetes125To126UbuntuUpgrade(t *testing.T) { provider := framework.NewNutanix(t, framework.WithUbuntu125Nutanix()) test := framework.NewClusterE2ETest( @@ -670,23 +543,6 @@ func TestNutanixKubernetes127to128RedHatUpgrade(t *testing.T) { ) } -func TestNutanixKubernetes124to125RedHatUpgrade(t *testing.T) { - provider := framework.NewNutanix(t, framework.WithRedHat124Nutanix()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(provider.RedHat125Template()), - ) -} - func TestNutanixKubernetes125to126RedHatUpgrade(t *testing.T) { provider := framework.NewNutanix(t, framework.WithRedHat125Nutanix()) test := framework.NewClusterE2ETest( @@ -738,23 +594,6 @@ func TestNutanixKubernetes127to128RedHat9Upgrade(t *testing.T) { ) } -func TestNutanixKubernetes124to125RedHat9Upgrade(t *testing.T) { - provider := framework.NewNutanix(t, framework.WithRedHat9Kubernetes124Nutanix()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(provider.RedHat9Kubernetes125Template()), - ) -} - func TestNutanixKubernetes125to126RedHat9Upgrade(t *testing.T) { provider := framework.NewNutanix(t, framework.WithRedHat9Kubernetes125Nutanix()) test := framework.NewClusterE2ETest( @@ -805,22 +644,6 @@ func TestNutanixKubernetes128UbuntuWorkerNodeScaleUp1To3(t *testing.T) { ) } -func TestNutanixKubernetes124UbuntuWorkerNodeScaleUp1To3(t *testing.T) { - provider := framework.NewNutanix(t, framework.WithUbuntu124Nutanix()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube124, - framework.WithClusterUpgrade(api.WithWorkerNodeCount(3)), - ) -} - // 1 worker node cluster scaled up to 3 func TestNutanixKubernetes125UbuntuWorkerNodeScaleUp1To3(t *testing.T) { provider := framework.NewNutanix(t, framework.WithUbuntu125Nutanix()) @@ -889,23 +712,6 @@ func TestNutanixKubernetes128UbuntuControlPlaneNodeScaleUp1To3(t *testing.T) { ) } -func TestNutanixKubernetes124UbuntuControlPlaneNodeScaleUp1To3(t *testing.T) { - provider := framework.NewNutanix(t, framework.WithUbuntu124Nutanix()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithEnvVar("features.NutanixProviderEnvVar", "true"), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube124, - framework.WithClusterFiller(api.WithControlPlaneCount(3)), - ) -} - // 1 node control plane cluster scaled up to 3 func TestNutanixKubernetes125UbuntuControlPlaneNodeScaleUp1To3(t *testing.T) { provider := framework.NewNutanix(t, framework.WithUbuntu125Nutanix()) @@ -973,22 +779,6 @@ func TestNutanixKubernetes128UbuntuWorkerNodeScaleDown3To1(t *testing.T) { ) } -func TestNutanixKubernetes124UbuntuWorkerNodeScaleDown3To1(t *testing.T) { - provider := framework.NewNutanix(t, framework.WithUbuntu124Nutanix()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(3)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube124, - framework.WithClusterUpgrade(api.WithWorkerNodeCount(1)), - ) -} - // 3 worker node cluster scaled down to 1 func TestNutanixKubernetes125UbuntuWorkerNodeScaleDown3To1(t *testing.T) { provider := framework.NewNutanix(t, framework.WithUbuntu125Nutanix()) @@ -1056,22 +846,6 @@ func TestNutanixKubernetes128UbuntuControlPlaneNodeScaleDown3To1(t *testing.T) { ) } -func TestNutanixKubernetes124UbuntuControlPlaneNodeScaleDown3To1(t *testing.T) { - provider := framework.NewNutanix(t, framework.WithUbuntu124Nutanix()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(3)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube124, - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - ) -} - // 3 node control plane cluster scaled down to 1 func TestNutanixKubernetes125UbuntuControlPlaneNodeScaleDown3To1(t *testing.T) { provider := framework.NewNutanix(t, framework.WithUbuntu125Nutanix()) @@ -1136,18 +910,6 @@ func TestNutanixKubernetes128OIDC(t *testing.T) { runOIDCFlow(test) } -func TestNutanixKubernetes124OIDC(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewNutanix(t, framework.WithUbuntu124Nutanix()), - framework.WithOIDC(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runOIDCFlow(test) -} - func TestNutanixKubernetes125OIDC(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1197,18 +959,6 @@ func TestNutanixKubernetes128AWSIamAuth(t *testing.T) { runAWSIamAuthFlow(test) } -func TestNutanixKubernetes124AWSIamAuth(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewNutanix(t, framework.WithUbuntu124Nutanix()), - framework.WithAWSIam(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runAWSIamAuthFlow(test) -} - func TestNutanixKubernetes125AWSIamAuth(t *testing.T) { test := framework.NewClusterE2ETest( t, diff --git a/test/e2e/snow_test.go b/test/e2e/snow_test.go index fb12c243743c..07f3bf164275 100644 --- a/test/e2e/snow_test.go +++ b/test/e2e/snow_test.go @@ -124,15 +124,6 @@ func TestSnowKubernetes128UbuntuProxyConfig(t *testing.T) { } // Simpleflow -func TestSnowKubernetes124SimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewSnow(t, framework.WithSnowUbuntu124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleFlow(test) -} - func TestSnowKubernetes125SimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -282,13 +273,6 @@ func TestSnowKubernetes127UbuntuTo128Upgrade(t *testing.T) { runSnowUpgradeTest(test, snow, snow.WithUbuntu127(), snow.WithUbuntu128()) } -func TestSnowKubernetes124UbuntuTo125Upgrade(t *testing.T) { - snow := framework.NewSnow(t) - test := framework.NewClusterE2ETest(t, snow) - - runSnowUpgradeTest(test, snow, snow.WithUbuntu124(), snow.WithUbuntu125()) -} - func TestSnowKubernetes125UbuntuTo126Upgrade(t *testing.T) { snow := framework.NewSnow(t) test := framework.NewClusterE2ETest(t, snow) @@ -310,13 +294,6 @@ func TestSnowKubernetes127BottlerocketTo128Upgrade(t *testing.T) { runSnowUpgradeTest(test, snow, snow.WithBottlerocket127(), snow.WithBottlerocket128()) } -func TestSnowKubernetes124BottlerocketTo125Upgrade(t *testing.T) { - snow := framework.NewSnow(t) - test := framework.NewClusterE2ETest(t, snow) - - runSnowUpgradeTest(test, snow, snow.WithBottlerocket124(), snow.WithBottlerocket125()) -} - func TestSnowKubernetes125BottlerocketTo126Upgrade(t *testing.T) { snow := framework.NewSnow(t) test := framework.NewClusterE2ETest(t, snow) @@ -338,13 +315,6 @@ func TestSnowKubernetes127To128BottlerocketStaticIPUpgrade(t *testing.T) { runSnowUpgradeTest(test, snow, snow.WithBottlerocketStaticIP127(), snow.WithBottlerocketStaticIP128()) } -func TestSnowKubernetes124To125BottlerocketStaticIPUpgrade(t *testing.T) { - snow := framework.NewSnow(t) - test := framework.NewClusterE2ETest(t, snow) - - runSnowUpgradeTest(test, snow, snow.WithBottlerocketStaticIP124(), snow.WithBottlerocketStaticIP125()) -} - func TestSnowKubernetes125To126BottlerocketStaticIPUpgrade(t *testing.T) { snow := framework.NewSnow(t) test := framework.NewClusterE2ETest(t, snow) diff --git a/test/e2e/tinkerbell_test.go b/test/e2e/tinkerbell_test.go index 4752b67273a2..a256dc24a218 100644 --- a/test/e2e/tinkerbell_test.go +++ b/test/e2e/tinkerbell_test.go @@ -44,25 +44,6 @@ func TestTinkerbellKubernetes128BottleRocketAWSIamAuth(t *testing.T) { } // Upgrade -func TestTinkerbellKubernetes124UbuntuTo125Upgrade(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu124Tinkerbell()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithControlPlaneHardware(2), - framework.WithWorkerHardware(2), - ) - runSimpleUpgradeFlowForBareMetal( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(framework.Ubuntu125Image()), - ) -} - func TestTinkerbellKubernetes125UbuntuTo126Upgrade(t *testing.T) { provider := framework.NewTinkerbell(t, framework.WithUbuntu125Tinkerbell()) test := framework.NewClusterE2ETest( @@ -741,130 +722,6 @@ func TestTinkerbellKubernetes125BottleRocketCuratedPackagesPrometheusSimpleFlow( runCuratedPackagesPrometheusInstallTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes124UbuntuSingleNodeCuratedPackagesFlow(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu124Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube124), - framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageInstallTinkerbellSingleNodeFlow(test) -} - -func TestTinkerbellKubernetes124BottleRocketSingleNodeCuratedPackagesFlow(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithBottleRocketTinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube124), - framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageInstallTinkerbellSingleNodeFlow(test) -} - -func TestTinkerbellKubernetes124UbuntuSingleNodeCuratedPackagesEmissaryFlow(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu124Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube124), - framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageEmissaryInstallTinkerbellSingleNodeFlow(test) -} - -func TestTinkerbellKubernetes124BottleRocketSingleNodeCuratedPackagesEmissaryFlow(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithBottleRocketTinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube124), - framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageEmissaryInstallTinkerbellSingleNodeFlow(test) -} - -func TestTinkerbellKubernetes124UbuntuSingleNodeCuratedPackagesHarborFlow(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu124Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube124), - framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageHarborInstallTinkerbellSimpleFlow(test) -} - -func TestTinkerbellKubernetes124BottleRocketSingleNodeCuratedPackagesHarborFlow(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithBottleRocketTinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube124), - framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageHarborInstallTinkerbellSimpleFlow(test) -} - -func TestTinkerbellKubernetes124UbuntuCuratedPackagesAdotSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu124Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube124), - framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesAdotInstallTinkerbellSimpleFlow(test) -} - -func TestTinkerbellKubernetes124BottleRocketCuratedPackagesAdotSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithBottleRocketTinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube124), - framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesAdotInstallTinkerbellSimpleFlow(test) -} - -func TestTinkerbellKubernetes124UbuntuCuratedPackagesPrometheusSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu124Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube124), - framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesPrometheusInstallTinkerbellSimpleFlow(test) -} - -func TestTinkerbellKubernetes124BottleRocketCuratedPackagesPrometheusSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithBottleRocketTinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube124), - framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesPrometheusInstallTinkerbellSimpleFlow(test) -} - func TestTinkerbellKubernetes128UbuntuSingleNodeCuratedPackagesFlow(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), @@ -1507,7 +1364,7 @@ func TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade127To128(t *testi ) } -func TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade124To125WithAPI(t *testing.T) { +func TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade125To126WithAPI(t *testing.T) { provider := framework.NewTinkerbell(t, framework.WithBottleRocketTinkerbell()) managementCluster := framework.NewClusterE2ETest( t, @@ -1516,7 +1373,7 @@ func TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade124To125WithAPI(t framework.WithWorkerHardware(1), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), ), ) test := framework.NewMulticlusterE2ETest( @@ -1530,7 +1387,7 @@ func TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade124To125WithAPI(t framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), api.WithManagementCluster(managementCluster.ClusterName), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), @@ -1539,7 +1396,7 @@ func TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade124To125WithAPI(t ) runWorkloadClusterUpgradeFlowWithAPIForBareMetal(test, api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube125), + api.WithKubernetesVersion(v1alpha1.Kube126), ), ) } @@ -1638,17 +1495,6 @@ func TestTinkerbellKubernetes128BottlerocketAuthenticatedRegistryMirror(t *testi } // Simpleflow -func TestTinkerbellKubernetes124UbuntuSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewTinkerbell(t, framework.WithUbuntu124Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithControlPlaneHardware(1), - framework.WithWorkerHardware(1), - ) - runTinkerbellSimpleFlow(test) -} - func TestTinkerbellKubernetes125UbuntuSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1693,19 +1539,6 @@ func TestTinkerbellKubernetes128UbuntuSimpleFlow(t *testing.T) { runTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes124Ubuntu2204SimpleFlow(t *testing.T) { - provider := framework.NewTinkerbell(t) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithControlPlaneHardware(1), - framework.WithWorkerHardware(1), - ).WithClusterConfig( - provider.WithKubeVersionAndOS(v1alpha1.Kube124, framework.Ubuntu2204, nil), - ) - runTinkerbellSimpleFlowWithoutClusterConfigGeneration(test) -} - func TestTinkerbellKubernetes125Ubuntu2204SimpleFlow(t *testing.T) { provider := framework.NewTinkerbell(t) test := framework.NewClusterE2ETest( @@ -1758,17 +1591,6 @@ func TestTinkerbellKubernetes128Ubuntu2204SimpleFlow(t *testing.T) { runTinkerbellSimpleFlowWithoutClusterConfigGeneration(test) } -func TestTinkerbellKubernetes124RedHatSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewTinkerbell(t, framework.WithRedHat124Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithControlPlaneHardware(1), - framework.WithWorkerHardware(1), - ) - runTinkerbellSimpleFlow(test) -} - func TestTinkerbellKubernetes125RedHatSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1813,17 +1635,6 @@ func TestTinkerbellKubernetes128RedHatSimpleFlow(t *testing.T) { runTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes124BottleRocketSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewTinkerbell(t, framework.WithBottleRocketTinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithControlPlaneHardware(1), - framework.WithWorkerHardware(1), - ) - runTinkerbellSimpleFlow(test) -} - func TestTinkerbellKubernetes125BottleRocketSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, diff --git a/test/e2e/vsphere_test.go b/test/e2e/vsphere_test.go index 3677c53e6c16..8d7098fde2d3 100644 --- a/test/e2e/vsphere_test.go +++ b/test/e2e/vsphere_test.go @@ -19,21 +19,6 @@ import ( ) // Autoimport -func TestVSphereKubernetes124BottlerocketAutoimport(t *testing.T) { - provider := framework.NewVSphere(t, - framework.WithVSphereFillers( - api.WithTemplateForAllMachines(""), - api.WithOsFamilyForAllMachines(v1alpha1.Bottlerocket), - ), - ) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runAutoImportFlow(test, provider) -} - func TestVSphereKubernetes125BottlerocketAutoimport(t *testing.T) { provider := framework.NewVSphere(t, framework.WithVSphereFillers( @@ -95,16 +80,6 @@ func TestVSphereKubernetes128BottlerocketAutoimport(t *testing.T) { } // AWS IAM Auth -func TestVSphereKubernetes124AWSIamAuth(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithAWSIam(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runAWSIamAuthFlow(test) -} - func TestVSphereKubernetes125AWSIamAuth(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -145,16 +120,6 @@ func TestVSphereKubernetes128AWSIamAuth(t *testing.T) { runAWSIamAuthFlow(test) } -func TestVSphereKubernetes124BottleRocketAWSIamAuth(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewVSphere(t, framework.WithBottleRocket124()), - framework.WithAWSIam(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runAWSIamAuthFlow(test) -} - func TestVSphereKubernetes125BottleRocketAWSIamAuth(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -212,18 +177,6 @@ func TestVSphereKubernetes127To128AWSIamAuthUpgrade(t *testing.T) { } // Curated packages -func TestVSphereKubernetes124CuratedPackagesSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageInstallSimpleFlow(test) -} - func TestVSphereKubernetes125CuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -272,18 +225,6 @@ func TestVSphereKubernetes128CuratedPackagesSimpleFlow(t *testing.T) { runCuratedPackageInstallSimpleFlow(test) } -func TestVSphereKubernetes124BottleRocketCuratedPackagesSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithBottleRocket124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageInstallSimpleFlow(test) -} - func TestVSphereKubernetes125BottleRocketCuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -332,18 +273,6 @@ func TestVSphereKubernetes128BottleRocketCuratedPackagesSimpleFlow(t *testing.T) runCuratedPackageInstallSimpleFlow(test) } -func TestVSphereKubernetes124CuratedPackagesEmissarySimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageEmissaryInstallSimpleFlow(test) -} - func TestVSphereKubernetes125CuratedPackagesEmissarySimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -392,18 +321,6 @@ func TestVSphereKubernetes128CuratedPackagesEmissarySimpleFlow(t *testing.T) { runCuratedPackageEmissaryInstallSimpleFlow(test) } -func TestVSphereKubernetes124BottleRocketCuratedPackagesEmissarySimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithBottleRocket124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageEmissaryInstallSimpleFlow(test) -} - func TestVSphereKubernetes125BottleRocketCuratedPackagesEmissarySimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -452,18 +369,6 @@ func TestVSphereKubernetes128BottleRocketCuratedPackagesEmissarySimpleFlow(t *te runCuratedPackageEmissaryInstallSimpleFlow(test) } -func TestVSphereKubernetes124CuratedPackagesHarborSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) -} - func TestVSphereKubernetes125CuratedPackagesHarborSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -512,18 +417,6 @@ func TestVSphereKubernetes128CuratedPackagesHarborSimpleFlow(t *testing.T) { runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) } -func TestVSphereKubernetes124BottleRocketCuratedPackagesHarborSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithBottleRocket124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) -} - func TestVSphereKubernetes125BottleRocketCuratedPackagesHarborSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -572,18 +465,6 @@ func TestVSphereKubernetes128BottleRocketCuratedPackagesHarborSimpleFlow(t *test runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) } -func TestVSphereKubernetes124CuratedPackagesAdotUpdateFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesAdotInstallUpdateFlow(test) -} - func TestVSphereKubernetes125CuratedPackagesAdotUpdateFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -632,18 +513,6 @@ func TestVSphereKubernetes128CuratedPackagesAdotUpdateFlow(t *testing.T) { runCuratedPackagesAdotInstallUpdateFlow(test) } -func TestVSphereKubernetes124BottleRocketCuratedPackagesAdotUpdateFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithBottleRocket124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesAdotInstallUpdateFlow(test) -} - func TestVSphereKubernetes125BottleRocketCuratedPackagesAdotUpdateFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -692,20 +561,6 @@ func TestVSphereKubernetes128BottleRocketCuratedPackagesAdotUpdateFlow(t *testin runCuratedPackagesAdotInstallUpdateFlow(test) } -func TestVSphereKubernetes124UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { - minNodes := 1 - maxNodes := 2 - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runAutoscalerWithMetricsServerSimpleFlow(test) -} - func TestVSphereKubernetes125UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { minNodes := 1 maxNodes := 2 @@ -762,20 +617,6 @@ func TestVSphereKubernetes128UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t runAutoscalerWithMetricsServerSimpleFlow(test) } -func TestVSphereKubernetes124BottleRocketCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { - minNodes := 1 - maxNodes := 2 - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithBottleRocket124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runAutoscalerWithMetricsServerSimpleFlow(test) -} - func TestVSphereKubernetes125BottleRocketCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { minNodes := 1 maxNodes := 2 @@ -832,18 +673,6 @@ func TestVSphereKubernetes128BottleRocketCuratedPackagesClusterAutoscalerSimpleF runAutoscalerWithMetricsServerSimpleFlow(test) } -func TestVSphereKubernetes124UbuntuCuratedPackagesPrometheusSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesPrometheusInstallSimpleFlow(test) -} - func TestVSphereKubernetes125UbuntuCuratedPackagesPrometheusSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -892,18 +721,6 @@ func TestVSphereKubernetes128UbuntuCuratedPackagesPrometheusSimpleFlow(t *testin runCuratedPackagesPrometheusInstallSimpleFlow(test) } -func TestVSphereKubernetes124BottleRocketCuratedPackagesPrometheusSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithBottleRocket124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube124), - EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, - EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), - ) - runCuratedPackagesPrometheusInstallSimpleFlow(test) -} - func TestVSphereKubernetes125BottleRocketCuratedPackagesPrometheusSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -952,13 +769,6 @@ func TestVSphereKubernetes128BottleRocketCuratedPackagesPrometheusSimpleFlow(t * runCuratedPackagesPrometheusInstallSimpleFlow(test) } -func TestVSphereKubernetes124UbuntuWorkloadClusterCuratedPackagesSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - provider := framework.NewVSphere(t, framework.WithUbuntu124()) - test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube124) - runCuratedPackageRemoteClusterInstallSimpleFlow(test) -} - func TestVSphereKubernetes125UbuntuWorkloadClusterCuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) provider := framework.NewVSphere(t, framework.WithUbuntu125()) @@ -1011,13 +821,6 @@ func TestVSphereMultipleTemplatesUbuntu127(t *testing.T) { runMultiTemplatesSimpleFlow(test) } -func TestVSphereKubernetes124BottleRocketWorkloadClusterCuratedPackagesSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - provider := framework.NewVSphere(t, framework.WithBottleRocket124()) - test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube124) - runCuratedPackageRemoteClusterInstallSimpleFlow(test) -} - func TestVSphereKubernetes125BottleRocketWorkloadClusterCuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) provider := framework.NewVSphere(t, framework.WithBottleRocket125()) @@ -1046,13 +849,6 @@ func TestVSphereKubernetes128BottleRocketWorkloadClusterCuratedPackagesSimpleFlo runCuratedPackageRemoteClusterInstallSimpleFlow(test) } -func TestVSphereKubernetes124UbuntuWorkloadClusterCuratedPackagesEmissarySimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - provider := framework.NewVSphere(t, framework.WithUbuntu124()) - test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube124) - runCuratedPackageEmissaryRemoteClusterInstallSimpleFlow(test) -} - func TestVSphereKubernetes125UbuntuWorkloadClusterCuratedPackagesEmissarySimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) provider := framework.NewVSphere(t, framework.WithUbuntu125()) @@ -1081,13 +877,6 @@ func TestVSphereKubernetes128UbuntuWorkloadClusterCuratedPackagesEmissarySimpleF runCuratedPackageEmissaryRemoteClusterInstallSimpleFlow(test) } -func TestVSphereKubernetes124BottleRocketWorkloadClusterCuratedPackagesEmissarySimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - provider := framework.NewVSphere(t, framework.WithBottleRocket124()) - test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube124) - runCuratedPackageEmissaryRemoteClusterInstallSimpleFlow(test) -} - func TestVSphereKubernetes125BottleRocketWorkloadClusterCuratedPackagesEmissarySimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) provider := framework.NewVSphere(t, framework.WithBottleRocket125()) @@ -1116,14 +905,6 @@ func TestVSphereKubernetes128BottleRocketWorkloadClusterCuratedPackagesEmissaryS runCuratedPackageEmissaryRemoteClusterInstallSimpleFlow(test) } -func TestVSphereKubernetes124UbuntuWorkloadClusterCuratedPackagesCertManagerSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - framework.CheckCertManagerCredentials(t) - provider := framework.NewVSphere(t, framework.WithUbuntu124()) - test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube124) - runCertManagerRemoteClusterInstallSimpleFlow(test) -} - func TestVSphereKubernetes125UbuntuWorkloadClusterCuratedPackagesCertManagerSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) framework.CheckCertManagerCredentials(t) @@ -1156,14 +937,6 @@ func TestVSphereKubernetes128UbuntuWorkloadClusterCuratedPackagesCertManagerSimp runCertManagerRemoteClusterInstallSimpleFlow(test) } -func TestVSphereKubernetes124BottleRocketWorkloadClusterCuratedPackagesCertManagerSimpleFlow(t *testing.T) { - framework.CheckCuratedPackagesCredentials(t) - framework.CheckCertManagerCredentials(t) - provider := framework.NewVSphere(t, framework.WithBottleRocket124()) - test := SetupSimpleMultiCluster(t, provider, v1alpha1.Kube124) - runCertManagerRemoteClusterInstallSimpleFlow(test) -} - func TestVSphereKubernetes125BottleRocketWorkloadClusterCuratedPackagesCertManagerSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) framework.CheckCertManagerCredentials(t) @@ -1416,19 +1189,6 @@ func TestVSphereUpgradeMulticlusterWorkloadClusterWithGithubFlux(t *testing.T) { } // OIDC -func TestVSphereKubernetes124OIDC(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithOIDC(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runOIDCFlow(test) -} - func TestVSphereKubernetes125OIDC(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1673,15 +1433,6 @@ func TestVSphereKubernetes128BottlerocketLinkedClone(t *testing.T) { } // Simpleflow -func TestVSphereKubernetes124Ubuntu2004SimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleFlow(test) -} - func TestVSphereKubernetes125Ubuntu2004SimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1718,17 +1469,6 @@ func TestVSphereKubernetes128Ubuntu2004SimpleFlow(t *testing.T) { runSimpleFlow(test) } -func TestVSphereKubernetes124Ubuntu2204SimpleFlow(t *testing.T) { - provider := framework.NewVSphere(t) - test := framework.NewClusterE2ETest( - t, - provider, - ).WithClusterConfig( - provider.WithKubeVersionAndOS(v1alpha1.Kube124, framework.Ubuntu2204, nil), - ) - runSimpleFlowWithoutClusterConfigGeneration(test) -} - func TestVSphereKubernetes125Ubuntu2204SimpleFlow(t *testing.T) { provider := framework.NewVSphere(t) test := framework.NewClusterE2ETest( @@ -1773,15 +1513,6 @@ func TestVSphereKubernetes128Ubuntu2204SimpleFlow(t *testing.T) { runSimpleFlowWithoutClusterConfigGeneration(test) } -func TestVSphereKubernetes124RedHatSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewVSphere(t, framework.WithRedHat124VSphere()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleFlow(test) -} - func TestVSphereKubernetes125RedHatSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1931,15 +1662,6 @@ func TestVSphereKubernetes128BottlerocketWithBottlerocketKubernetesSettings(t *t } // Stacked etcd -func TestVSphereKubernetes124StackedEtcdUbuntu(t *testing.T) { - test := framework.NewClusterE2ETest(t, - framework.NewVSphere(t, framework.WithUbuntu124()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithControlPlaneCount(3)), - framework.WithClusterFiller(api.WithStackedEtcdTopology())) - runStackedEtcdFlow(test) -} - func TestVSphereKubernetes125StackedEtcdUbuntu(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewVSphere(t, framework.WithUbuntu125()), @@ -2030,21 +1752,6 @@ func TestVSphereKubernetes128BottlerocketTaintsUpgradeFlow(t *testing.T) { } // Upgrade -func TestVSphereKubernetes124UbuntuTo125Upgrade(t *testing.T) { - provider := framework.NewVSphere(t, framework.WithUbuntu124()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - ) - runSimpleUpgradeFlow( - test, - v1alpha1.Kube125, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), - provider.WithProviderUpgrade(provider.Ubuntu125Template()), - ) -} - func TestVSphereKubernetes125UbuntuTo126Upgrade(t *testing.T) { provider := framework.NewVSphere(t, framework.WithUbuntu125()) test := framework.NewClusterE2ETest( @@ -2404,58 +2111,6 @@ func TestVSphereKubernetes127UbuntuTo128UpgradeWithCheckpoint(t *testing.T) { ) } -func TestVSphereKubernetes124BottlerocketUpgradeFromLatestMinorRelease(t *testing.T) { - release := latestMinorRelease(t) - provider := framework.NewVSphere(t, - framework.WithVSphereFillers( - api.WithOsFamilyForAllMachines(v1alpha1.Bottlerocket), - ), - framework.WithKubeVersionAndOSForRelease(v1alpha1.Kube124, framework.Bottlerocket1, release), - ) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runUpgradeFromReleaseFlow( - test, - release, - v1alpha1.Kube124, - provider.WithProviderUpgrade( - provider.Bottlerocket124Template(), // Set the template so it doesn't get autoimported - ), - ) -} - -func TestVSphereKubernetes124UbuntuUpgradeFromLatestMinorRelease(t *testing.T) { - release := latestMinorRelease(t) - provider := framework.NewVSphere(t, - framework.WithVSphereFillers( - api.WithOsFamilyForAllMachines(v1alpha1.Ubuntu), - ), - framework.WithKubeVersionAndOSForRelease(v1alpha1.Kube124, framework.Ubuntu2004, release), - ) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runUpgradeFromReleaseFlow( - test, - release, - v1alpha1.Kube124, - provider.WithProviderUpgrade( - provider.Ubuntu124Template(), // Set the template so it doesn't get autoimported - ), - ) -} - func TestVSphereKubernetes127RedhatUpgradeFromLatestMinorRelease(t *testing.T) { release := latestMinorRelease(t) provider := framework.NewVSphere(t, @@ -2487,45 +2142,18 @@ func TestVSphereKubernetes126WithOIDCManagementClusterUpgradeFromLatestSideEffec runTestManagementClusterUpgradeSideEffects(t, provider, framework.Ubuntu2004, v1alpha1.Kube126) } -func TestVSphereKubernetes124UbuntuUpgradeFromLatestMinorReleaseAlwaysNetworkPolicy(t *testing.T) { +func TestVSphereKubernetes125UbuntuUpgradeFromLatestMinorReleaseAlwaysNetworkPolicy(t *testing.T) { release := latestMinorRelease(t) provider := framework.NewVSphere(t, framework.WithVSphereFillers( api.WithOsFamilyForAllMachines(v1alpha1.Ubuntu), ), - framework.WithKubeVersionAndOSForRelease(v1alpha1.Kube124, framework.Ubuntu2004, release), - ) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), - framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - ) - runUpgradeFromReleaseFlow( - test, - release, - v1alpha1.Kube124, - framework.WithClusterFiller(api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways)), - provider.WithProviderUpgrade( - provider.Ubuntu124Template(), // Set the template so it doesn't get autoimported - ), - ) -} - -func TestVSphereKubernetes124To125UbuntuUpgradeFromLatestMinorRelease(t *testing.T) { - release := latestMinorRelease(t) - provider := framework.NewVSphere(t, - framework.WithVSphereFillers( - api.WithOsFamilyForAllMachines(v1alpha1.Ubuntu), - ), - framework.WithKubeVersionAndOSForRelease(v1alpha1.Kube124, framework.Ubuntu2004, release), + framework.WithKubeVersionAndOSForRelease(v1alpha1.Kube125, framework.Ubuntu2004, release), ) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube124)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube125)), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), @@ -2534,10 +2162,10 @@ func TestVSphereKubernetes124To125UbuntuUpgradeFromLatestMinorRelease(t *testing test, release, v1alpha1.Kube125, + framework.WithClusterFiller(api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways)), provider.WithProviderUpgrade( provider.Ubuntu125Template(), // Set the template so it doesn't get autoimported ), - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube125)), ) } @@ -2689,13 +2317,13 @@ func TestVSphereKubernetes127To128RedhatUpgradeFromLatestMinorRelease(t *testing ) } -func TestVSphereKubernetes124UbuntuUpgradeAndRemoveWorkerNodeGroupsAPI(t *testing.T) { +func TestVSphereKubernetes125UbuntuUpgradeAndRemoveWorkerNodeGroupsAPI(t *testing.T) { provider := framework.NewVSphere(t) test := framework.NewClusterE2ETest( t, provider, ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube124), + api.WithKubernetesVersion(v1alpha1.Kube125), api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -2703,7 +2331,7 @@ func TestVSphereKubernetes124UbuntuUpgradeAndRemoveWorkerNodeGroupsAPI(t *testin provider.WithNewWorkerNodeGroup("worker-1", framework.WithWorkerNodeGroup("worker-1", api.WithCount(2))), provider.WithNewWorkerNodeGroup("worker-2", framework.WithWorkerNodeGroup("worker-2", api.WithCount(1))), provider.WithNewWorkerNodeGroup("worker-3", framework.WithWorkerNodeGroup("worker-3", api.WithCount(1), api.WithLabel("tier", "frontend"))), - provider.WithUbuntu124(), + provider.WithUbuntu125(), ) runUpgradeFlowWithAPI( @@ -2797,7 +2425,7 @@ func TestVSphereMulticlusterWorkloadClusterAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ), framework.NewClusterE2ETest( t, vsphere, framework.WithClusterName(test.NewWorkloadClusterName()), @@ -2808,7 +2436,7 @@ func TestVSphereMulticlusterWorkloadClusterAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - vsphere.WithUbuntu125(), + vsphere.WithUbuntu126(), ), framework.NewClusterE2ETest( t, vsphere, framework.WithClusterName(test.NewWorkloadClusterName()), @@ -2819,7 +2447,7 @@ func TestVSphereMulticlusterWorkloadClusterAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - vsphere.WithUbuntu126(), + vsphere.WithUbuntu127(), ), ) test.CreateManagementCluster() @@ -2845,7 +2473,7 @@ func TestVSphereUpgradeLabelsTaintsUbuntuAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ) test := framework.NewMulticlusterE2ETest(t, managementCluster) @@ -2862,7 +2490,7 @@ func TestVSphereUpgradeLabelsTaintsUbuntuAPI(t *testing.T) { vsphere.WithNewWorkerNodeGroup("worker-0", framework.WithWorkerNodeGroup("worker-0", api.WithCount(2), api.WithLabel("key1", "val2"), api.WithTaint(framework.NoScheduleTaint()))), vsphere.WithNewWorkerNodeGroup("worker-1", framework.WithWorkerNodeGroup("worker-1", api.WithCount(1))), vsphere.WithNewWorkerNodeGroup("worker-2", framework.WithWorkerNodeGroup("worker-2", api.WithCount(1), api.WithLabel("key2", "val2"), api.WithTaint(framework.PreferNoScheduleTaint()))), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ), ) @@ -2888,7 +2516,7 @@ func TestVSphereUpgradeWorkerNodeGroupsUbuntuAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ) test := framework.NewMulticlusterE2ETest(t, managementCluster) @@ -2904,7 +2532,7 @@ func TestVSphereUpgradeWorkerNodeGroupsUbuntuAPI(t *testing.T) { ), vsphere.WithNewWorkerNodeGroup("worker-0", framework.WithWorkerNodeGroup("worker-0", api.WithCount(1))), vsphere.WithNewWorkerNodeGroup("worker-1", framework.WithWorkerNodeGroup("worker-1", api.WithCount(1))), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ), ) @@ -2928,7 +2556,7 @@ func TestVSphereMulticlusterWorkloadClusterGitHubFluxAPI(t *testing.T) { api.WithStackedEtcdTopology(), ), framework.WithFluxGithubConfig(), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ) test := framework.NewMulticlusterE2ETest(t, managementCluster) test.WithWorkloadClusters( @@ -2952,7 +2580,7 @@ func TestVSphereMulticlusterWorkloadClusterGitHubFluxAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithExternalEtcdTopology(1), ), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ), ) @@ -3014,7 +2642,7 @@ func TestVSphereCiliumUbuntuAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ) test := framework.NewMulticlusterE2ETest(t, managementCluster) @@ -3029,7 +2657,7 @@ func TestVSphereCiliumUbuntuAPI(t *testing.T) { api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate ), vsphere.WithNewWorkerNodeGroup("worker-0", framework.WithWorkerNodeGroup("worker-0", api.WithCount(1))), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ), ) @@ -3063,7 +2691,7 @@ func TestVSphereUpgradeLabelsTaintsBottleRocketGitHubFluxAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - vsphere.WithBottleRocket124(), + vsphere.WithBottleRocket125(), framework.WithFluxGithubConfig(), ) @@ -3081,7 +2709,7 @@ func TestVSphereUpgradeLabelsTaintsBottleRocketGitHubFluxAPI(t *testing.T) { vsphere.WithNewWorkerNodeGroup("worker-0", framework.WithWorkerNodeGroup("worker-0", api.WithCount(2), api.WithLabel("key1", "val2"), api.WithTaint(framework.NoScheduleTaint()))), vsphere.WithNewWorkerNodeGroup("worker-1", framework.WithWorkerNodeGroup("worker-1", api.WithCount(1))), vsphere.WithNewWorkerNodeGroup("worker-2", framework.WithWorkerNodeGroup("worker-2", api.WithCount(1), api.WithLabel("key2", "val2"), api.WithTaint(framework.PreferNoScheduleTaint()))), - vsphere.WithBottleRocket124(), + vsphere.WithBottleRocket125(), ), ) @@ -3107,7 +2735,7 @@ func TestVSphereUpgradeWorkerNodeGroupsUbuntuGitHubFluxAPI(t *testing.T) { api.WithWorkerNodeCount(1), api.WithStackedEtcdTopology(), ), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), framework.WithFluxGithubConfig(), ) @@ -3124,7 +2752,7 @@ func TestVSphereUpgradeWorkerNodeGroupsUbuntuGitHubFluxAPI(t *testing.T) { ), vsphere.WithNewWorkerNodeGroup("worker-0", framework.WithWorkerNodeGroup("worker-0", api.WithCount(1))), vsphere.WithNewWorkerNodeGroup("worker-1", framework.WithWorkerNodeGroup("worker-1", api.WithCount(1))), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ), ) @@ -3164,7 +2792,7 @@ func TestVSphereUpgradeKubernetesCiliumUbuntuGitHubFluxAPI(t *testing.T) { api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate ), vsphere.WithNewWorkerNodeGroup("worker-0", framework.WithWorkerNodeGroup("worker-0", api.WithCount(1))), - vsphere.WithUbuntu124(), + vsphere.WithUbuntu125(), ), ) @@ -3177,7 +2805,7 @@ func TestVSphereUpgradeKubernetesCiliumUbuntuGitHubFluxAPI(t *testing.T) { api.ClusterToConfigFiller( api.WithCiliumPolicyEnforcementMode(v1alpha1.CiliumPolicyModeAlways), ), - vsphere.WithUbuntu125(), + vsphere.WithUbuntu126(), ) wc.ValidateClusterState() test.DeleteWorkloadClusterFromGit(wc) diff --git a/test/framework/vsphere.go b/test/framework/vsphere.go index aaa0cc23d6b9..c0b5a4fb77af 100644 --- a/test/framework/vsphere.go +++ b/test/framework/vsphere.go @@ -436,16 +436,10 @@ func (v *VSphere) WithUbuntu128() api.ClusterConfigFiller { return v.WithKubeVersionAndOS(anywherev1.Kube128, Ubuntu2004, nil) } -// WithBottleRocket123 returns a cluster config filler that sets the kubernetes version of the cluster to 1.23 +// WithBottleRocket125 returns a cluster config filler that sets the kubernetes version of the cluster to 1.25 // as well as the right botllerocket template and osFamily for all VSphereMachineConfigs. -func (v *VSphere) WithBottleRocket123() api.ClusterConfigFiller { - return v.WithKubeVersionAndOS(anywherev1.Kube123, Bottlerocket1, nil) -} - -// WithBottleRocket124 returns a cluster config filler that sets the kubernetes version of the cluster to 1.24 -// as well as the right botllerocket template and osFamily for all VSphereMachineConfigs. -func (v *VSphere) WithBottleRocket124() api.ClusterConfigFiller { - return v.WithKubeVersionAndOS(anywherev1.Kube124, Bottlerocket1, nil) +func (v *VSphere) WithBottleRocket125() api.ClusterConfigFiller { + return v.WithKubeVersionAndOS(anywherev1.Kube125, Bottlerocket1, nil) } // CleanupVMs deletes all the VMs owned by the test EKS-A cluster. It satisfies the test framework Provider.