diff --git a/test/e2e/QUICK_TESTS.yaml b/test/e2e/QUICK_TESTS.yaml index d3ff8a0272ed..cb62cc91cd78 100644 --- a/test/e2e/QUICK_TESTS.yaml +++ b/test/e2e/QUICK_TESTS.yaml @@ -1,6 +1,6 @@ quick_tests: # Docker -- TestDocker.*130 +- TestDocker.*131 # vSphere - ^TestVSphereKubernetes129To130RedHatUpgrade$ - TestVSphereKubernetes129To130StackedEtcdRedHatUpgrade diff --git a/test/e2e/constants.go b/test/e2e/constants.go index 81bc79690c82..f032bce46220 100644 --- a/test/e2e/constants.go +++ b/test/e2e/constants.go @@ -48,5 +48,5 @@ const ( var ( EksaPackageControllerHelmValues = []string{"sourceRegistry=public.ecr.aws/l0g8r8j6"} - KubeVersions = []v1alpha1.KubernetesVersion{v1alpha1.Kube126, v1alpha1.Kube127, v1alpha1.Kube128, v1alpha1.Kube129, v1alpha1.Kube130} + KubeVersions = []v1alpha1.KubernetesVersion{v1alpha1.Kube126, v1alpha1.Kube127, v1alpha1.Kube128, v1alpha1.Kube129, v1alpha1.Kube130, v1alpha1.Kube131} ) diff --git a/test/e2e/docker_test.go b/test/e2e/docker_test.go index be953d90a894..c024eb627864 100644 --- a/test/e2e/docker_test.go +++ b/test/e2e/docker_test.go @@ -94,6 +94,45 @@ func TestDockerInstallGithubFluxDuringUpgrade(t *testing.T) { ) } +func TestDockerKubernetes131UpgradeWorkloadClusterWithGithubFlux(t *testing.T) { + provider := framework.NewDocker(t) + test := framework.NewMulticlusterE2ETest( + t, + framework.NewClusterE2ETest( + t, + provider, + framework.WithFluxGithub(), + framework.WithClusterFiller( + api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithControlPlaneCount(1), + api.WithWorkerNodeCount(1), + ), + ), + framework.NewClusterE2ETest( + t, + provider, + framework.WithFluxGithub(), + framework.WithClusterFiller( + api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithControlPlaneCount(1), + api.WithWorkerNodeCount(1), + ), + ), + ) + runWorkloadClusterFlowWithGitOps( + test, + framework.WithClusterUpgradeGit( + api.WithKubernetesVersion(v1alpha1.Kube131), + api.WithControlPlaneCount(2), + api.WithWorkerNodeCount(2), + ), + // Needed in order to replace the DockerDatacenterConfig namespace field with the value specified + // compared to when it was initially created without it. + provider.WithProviderUpgradeGit(), + ) +} + +// Curated Packages func TestDockerKubernetes126CuratedPackagesSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -154,6 +193,19 @@ func TestDockerKubernetes130CuratedPackagesSimpleFlow(t *testing.T) { runCuratedPackageInstallSimpleFlow(test) } +func TestDockerKubernetes131CuratedPackagesSimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, + framework.NewDocker(t), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube131), + EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) + runCuratedPackageInstallSimpleFlow(test) +} + +// Emissary func TestDockerKubernetes126CuratedPackagesEmissarySimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -214,6 +266,19 @@ func TestDockerKubernetes130CuratedPackagesEmissarySimpleFlow(t *testing.T) { runCuratedPackageEmissaryInstallSimpleFlow(test) } +func TestDockerKubernetes131CuratedPackagesEmissarySimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, + framework.NewDocker(t), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube131), + EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) + runCuratedPackageEmissaryInstallSimpleFlow(test) +} + +// Harbor func TestDockerKubernetes126CuratedPackagesHarborSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, @@ -274,6 +339,19 @@ func TestDockerKubernetes130CuratedPackagesHarborSimpleFlow(t *testing.T) { runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) } +func TestDockerKubernetes131CuratedPackagesHarborSimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, + framework.NewDocker(t), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube131), + EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) + runCuratedPackageHarborInstallSimpleFlowLocalStorageProvisioner(test) +} + +// ADOT func TestDockerKubernetes126CuratedPackagesAdotSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, framework.NewDocker(t), @@ -329,6 +407,18 @@ func TestDockerKubernetes130CuratedPackagesAdotSimpleFlow(t *testing.T) { runCuratedPackagesAdotInstallSimpleFlow(test) // other args as necessary } +func TestDockerKubernetes131CuratedPackagesAdotSimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, framework.NewDocker(t), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube131), + EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) + runCuratedPackagesAdotInstallSimpleFlow(test) // other args as necessary +} + +// Prometheus func TestDockerKubernetes126CuratedPackagesPrometheusSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, framework.NewDocker(t), @@ -384,6 +474,18 @@ func TestDockerKubernetes130CuratedPackagesPrometheusSimpleFlow(t *testing.T) { runCuratedPackagesPrometheusInstallSimpleFlow(test) } +func TestDockerKubernetes131CuratedPackagesPrometheusSimpleFlow(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, framework.NewDocker(t), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube131), + EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), + ) + runCuratedPackagesPrometheusInstallSimpleFlow(test) +} + +// Curated Packages Disabled func TestDockerKubernetes126CuratedPackagesDisabled(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, framework.NewDocker(t), @@ -396,6 +498,18 @@ func TestDockerKubernetes126CuratedPackagesDisabled(t *testing.T) { runDisabledCuratedPackageInstallSimpleFlow(test) // other args as necessary } +func TestDockerKubernetes127CuratedPackagesDisabled(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, framework.NewDocker(t), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube127), + EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, + &v1alpha1.PackageConfiguration{Disable: true}), + ) + runDisabledCuratedPackageInstallSimpleFlow(test) // other args as necessary +} + func TestDockerKubernetes128CuratedPackagesDisabled(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, framework.NewDocker(t), @@ -420,6 +534,31 @@ func TestDockerKubernetes129CuratedPackagesDisabled(t *testing.T) { runDisabledCuratedPackageInstallSimpleFlow(test) // other args as necessary } +func TestDockerKubernetes130CuratedPackagesDisabled(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, framework.NewDocker(t), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube130), + EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, + &v1alpha1.PackageConfiguration{Disable: true}), + ) + runDisabledCuratedPackageInstallSimpleFlow(test) // other args as necessary +} + +func TestDockerKubernetes131CuratedPackagesDisabled(t *testing.T) { + framework.CheckCuratedPackagesCredentials(t) + test := framework.NewClusterE2ETest(t, framework.NewDocker(t), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube131), + EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, + EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, + &v1alpha1.PackageConfiguration{Disable: true}), + ) + runDisabledCuratedPackageInstallSimpleFlow(test) // other args as necessary +} + +// MetalLB func TestDockerKubernetes126CuratedPackagesMetalLB(t *testing.T) { RunMetalLBDockerTestsForKubeVersion(t, v1alpha1.Kube126) } @@ -440,6 +579,10 @@ func TestDockerKubernetes130CuratedPackagesMetalLB(t *testing.T) { RunMetalLBDockerTestsForKubeVersion(t, v1alpha1.Kube130) } +func TestDockerKubernetes131CuratedPackagesMetalLB(t *testing.T) { + RunMetalLBDockerTestsForKubeVersion(t, v1alpha1.Kube131) +} + // AWS IAM Auth func TestDockerKubernetes126AWSIamAuth(t *testing.T) { test := framework.NewClusterE2ETest(t, @@ -486,43 +629,13 @@ func TestDockerKubernetes130AWSIamAuth(t *testing.T) { runAWSIamAuthFlow(test) } -// Flux -func TestDockerKubernetes130UpgradeWorkloadClusterWithGithubFlux(t *testing.T) { - provider := framework.NewDocker(t) - test := framework.NewMulticlusterE2ETest( - t, - framework.NewClusterE2ETest( - t, - provider, - framework.WithFluxGithub(), - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), - api.WithControlPlaneCount(1), - api.WithWorkerNodeCount(1), - ), - ), - framework.NewClusterE2ETest( - t, - provider, - framework.WithFluxGithub(), - framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), - api.WithControlPlaneCount(1), - api.WithWorkerNodeCount(1), - ), - ), - ) - runWorkloadClusterFlowWithGitOps( - test, - framework.WithClusterUpgradeGit( - api.WithKubernetesVersion(v1alpha1.Kube130), - api.WithControlPlaneCount(2), - api.WithWorkerNodeCount(2), - ), - // Needed in order to replace the DockerDatacenterConfig namespace field with the value specified - // compared to when it was initially created without it. - provider.WithProviderUpgradeGit(), +func TestDockerKubernetes131AWSIamAuth(t *testing.T) { + test := framework.NewClusterE2ETest(t, + framework.NewDocker(t), + framework.WithAWSIam(), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), ) + runAWSIamAuthFlow(test) } // OIDC @@ -571,57 +684,66 @@ func TestDockerKubernetes130OIDC(t *testing.T) { runOIDCFlow(test) } -// RegistryMirror -func TestDockerKubernetes130RegistryMirrorAndCert(t *testing.T) { +func TestDockerKubernetes131OIDC(t *testing.T) { + test := framework.NewClusterE2ETest(t, + framework.NewDocker(t), + framework.WithOIDC(), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), + ) + runOIDCFlow(test) +} + +// Registry Mirror +func TestDockerKubernetes131RegistryMirrorAndCert(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewDocker(t), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), framework.WithRegistryMirrorEndpointAndCert(constants.DockerProviderName), ) runRegistryMirrorConfigFlow(test) } -func TestDockerKubernetes130AirgappedRegistryMirrorAndCert(t *testing.T) { +func TestDockerKubernetes131AirgappedRegistryMirrorAndCert(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewDocker(t), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), framework.WithRegistryMirrorEndpointAndCert(constants.DockerProviderName), ) runDockerAirgapConfigFlow(test) } -func TestDockerKubernetes130AirgappedUpgradeFromLatestRegistryMirrorAndCert(t *testing.T) { +func TestDockerKubernetes131AirgappedUpgradeFromLatestRegistryMirrorAndCert(t *testing.T) { release := latestMinorRelease(t) test := framework.NewClusterE2ETest( t, framework.NewDocker(t), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), framework.WithRegistryMirrorEndpointAndCert(constants.DockerProviderName), ) runDockerAirgapUpgradeFromReleaseFlow( test, release, - v1alpha1.Kube130, + v1alpha1.Kube131, ) } -func TestDockerKubernetes130RegistryMirrorInsecureSkipVerify(t *testing.T) { +func TestDockerKubernetes131RegistryMirrorInsecureSkipVerify(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewDocker(t), framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), framework.WithRegistryMirrorInsecureSkipVerify(constants.DockerProviderName), ) runRegistryMirrorConfigFlow(test) } -// Simple flow +// Simple Flow func TestDockerKubernetes126SimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -667,7 +789,16 @@ func TestDockerKubernetes130SimpleFlow(t *testing.T) { runSimpleFlow(test) } -// Stacked etcd +func TestDockerKubernetes131SimpleFlow(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewDocker(t), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), + ) + runSimpleFlow(test) +} + +// Stacked Etcd func TestDockerKubernetesStackedEtcd(t *testing.T) { test := framework.NewClusterE2ETest(t, framework.NewDocker(t), @@ -676,14 +807,14 @@ func TestDockerKubernetesStackedEtcd(t *testing.T) { } // Taints -func TestDockerKubernetes130Taints(t *testing.T) { +func TestDockerKubernetes131Taints(t *testing.T) { provider := framework.NewDocker(t) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -695,7 +826,7 @@ func TestDockerKubernetes130Taints(t *testing.T) { runTaintsUpgradeFlow( test, - v1alpha1.Kube130, + v1alpha1.Kube131, framework.WithClusterUpgrade( api.WithWorkerNodeGroup(worker0, api.WithTaint(framework.NoExecuteTaint())), api.WithWorkerNodeGroup(worker1, api.WithTaint(framework.NoExecuteTaint())), @@ -705,14 +836,14 @@ func TestDockerKubernetes130Taints(t *testing.T) { ) } -func TestDockerKubernetes130WorkloadClusterTaints(t *testing.T) { +func TestDockerKubernetes131WorkloadClusterTaints(t *testing.T) { provider := framework.NewDocker(t) managementCluster := framework.NewClusterE2ETest( t, provider, ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithExternalEtcdTopology(1), @@ -726,7 +857,7 @@ func TestDockerKubernetes130WorkloadClusterTaints(t *testing.T) { t, provider, framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithManagementCluster(managementCluster.ClusterName), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -741,36 +872,67 @@ func TestDockerKubernetes130WorkloadClusterTaints(t *testing.T) { } // Upgrade -func TestDockerKubernetes129To130StackedEtcdUpgrade(t *testing.T) { +func TestDockerKubernetes128UpgradeAndRemoveWorkerNodeGroupsAPI(t *testing.T) { + provider := framework.NewDocker(t) + test := framework.NewClusterE2ETest( + t, provider, + ).WithClusterConfig( + api.ClusterToConfigFiller( + api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithExternalEtcdTopology(1), + api.WithControlPlaneCount(1), + api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate + ), + provider.WithNewWorkerNodeGroup("", framework.WithWorkerNodeGroup("worker-1", api.WithCount(2))), + provider.WithNewWorkerNodeGroup("", framework.WithWorkerNodeGroup("worker-2", api.WithCount(1))), + provider.WithNewWorkerNodeGroup( + "", framework.WithWorkerNodeGroup("worker-3", api.WithCount(1), api.WithLabel("tier", "frontend")), + ), + ) + + runUpgradeFlowWithAPI( + test, + api.ClusterToConfigFiller( + api.RemoveWorkerNodeGroup("worker-2"), + api.WithWorkerNodeGroup("worker-1", api.WithCount(1)), + api.RemoveWorkerNodeGroup("worker-3"), + api.WithWorkerNodeGroup("worker-3", api.WithCount(1), api.WithTaint(framework.NoScheduleTaint())), + ), + provider.WithNewWorkerNodeGroup("", framework.WithWorkerNodeGroup("worker-4", api.WithCount(1))), + ) +} + +func TestDockerKubernetes130To131StackedEtcdUpgrade(t *testing.T) { provider := framework.NewDocker(t) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller(api.WithStackedEtcdTopology()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), ) runSimpleUpgradeFlow( test, - v1alpha1.Kube130, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)), + v1alpha1.Kube131, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube131)), ) } -func TestDockerKubernetes129To130ExternalEtcdUpgrade(t *testing.T) { +func TestDockerKubernetes130To131ExternalEtcdUpgrade(t *testing.T) { provider := framework.NewDocker(t) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), ) runSimpleUpgradeFlow( test, - v1alpha1.Kube130, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)), + v1alpha1.Kube131, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube131)), ) } +// Upgrade From Latest Minor Release func TestDockerKubernetes126to127UpgradeFromLatestMinorRelease(t *testing.T) { release := latestMinorRelease(t) provider := framework.NewDocker(t) @@ -847,6 +1009,25 @@ func TestDockerKubernetes129to130UpgradeFromLatestMinorRelease(t *testing.T) { ) } +func TestDockerKubernetes130to131UpgradeFromLatestMinorRelease(t *testing.T) { + release := latestMinorRelease(t) + provider := framework.NewDocker(t) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), + framework.WithClusterFiller(api.WithExternalEtcdTopology(1)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + ) + runUpgradeFromReleaseFlow( + test, + release, + v1alpha1.Kube131, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube131)), + ) +} + func TestDockerKubernetes127to128GithubFluxEnabledUpgradeFromLatestMinorRelease(t *testing.T) { release := latestMinorRelease(t) test := framework.NewClusterE2ETest( @@ -866,39 +1047,9 @@ func TestDockerKubernetes127to128GithubFluxEnabledUpgradeFromLatestMinorRelease( ) } -func TestDockerKubernetes130WithOIDCManagementClusterUpgradeFromLatestSideEffects(t *testing.T) { - provider := framework.NewDocker(t) - runTestManagementClusterUpgradeSideEffects(t, provider, framework.DockerOS, v1alpha1.Kube130) -} - -func TestDockerKubernetes128UpgradeAndRemoveWorkerNodeGroupsAPI(t *testing.T) { +func TestDockerKubernetes131WithOIDCManagementClusterUpgradeFromLatestSideEffects(t *testing.T) { provider := framework.NewDocker(t) - test := framework.NewClusterE2ETest( - t, provider, - ).WithClusterConfig( - api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), - api.WithExternalEtcdTopology(1), - api.WithControlPlaneCount(1), - api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate - ), - provider.WithNewWorkerNodeGroup("", framework.WithWorkerNodeGroup("worker-1", api.WithCount(2))), - provider.WithNewWorkerNodeGroup("", framework.WithWorkerNodeGroup("worker-2", api.WithCount(1))), - provider.WithNewWorkerNodeGroup( - "", framework.WithWorkerNodeGroup("worker-3", api.WithCount(1), api.WithLabel("tier", "frontend")), - ), - ) - - runUpgradeFlowWithAPI( - test, - api.ClusterToConfigFiller( - api.RemoveWorkerNodeGroup("worker-2"), - api.WithWorkerNodeGroup("worker-1", api.WithCount(1)), - api.RemoveWorkerNodeGroup("worker-3"), - api.WithWorkerNodeGroup("worker-3", api.WithCount(1), api.WithTaint(framework.NoScheduleTaint())), - ), - provider.WithNewWorkerNodeGroup("", framework.WithWorkerNodeGroup("worker-4", api.WithCount(1))), - ) + runTestManagementClusterUpgradeSideEffects(t, provider, framework.DockerOS, v1alpha1.Kube131) } // Workload Cluster API @@ -1022,7 +1173,7 @@ func TestDockerUpgradeWorkloadClusterScaleAddRemoveWorkerNodeGroupsAPI(t *testin ) } -func TestDockerKubernetes129to130UpgradeFromLatestMinorReleaseAPI(t *testing.T) { +func TestDockerKubernetes130to131UpgradeFromLatestMinorReleaseAPI(t *testing.T) { release := latestMinorRelease(t) provider := framework.NewDocker(t) managementCluster := framework.NewClusterE2ETest( @@ -1030,7 +1181,7 @@ func TestDockerKubernetes129to130UpgradeFromLatestMinorReleaseAPI(t *testing.T) ) managementCluster.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release)) managementCluster.UpdateClusterConfig(api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), )) test := framework.NewMulticlusterE2ETest(t, managementCluster) @@ -1039,7 +1190,7 @@ func TestDockerKubernetes129to130UpgradeFromLatestMinorReleaseAPI(t *testing.T) ) wc.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release)) wc.UpdateClusterConfig(api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithManagementCluster(managementCluster.ClusterName), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), @@ -1051,18 +1202,18 @@ func TestDockerKubernetes129to130UpgradeFromLatestMinorReleaseAPI(t *testing.T) test, release, wc.ClusterConfig.Cluster.Spec.KubernetesVersion, - v1alpha1.Kube130, + v1alpha1.Kube131, "", ) } -func TestDockerUpgradeKubernetes129to130WorkloadClusterScaleupGitHubFluxAPI(t *testing.T) { +func TestDockerUpgradeKubernetes130to131WorkloadClusterScaleupGitHubFluxAPI(t *testing.T) { provider := framework.NewDocker(t) managementCluster := framework.NewClusterE2ETest( t, provider, framework.WithFluxGithubEnvVarCheck(), framework.WithFluxGithubCleanup(), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithExternalEtcdTopology(1), @@ -1075,7 +1226,7 @@ func TestDockerUpgradeKubernetes129to130WorkloadClusterScaleupGitHubFluxAPI(t *t t, provider, framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithManagementCluster(managementCluster.ClusterName), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -1087,20 +1238,20 @@ func TestDockerUpgradeKubernetes129to130WorkloadClusterScaleupGitHubFluxAPI(t *t runWorkloadClusterUpgradeFlowAPIWithFlux( test, api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithControlPlaneCount(3), api.WithWorkerNodeGroup("worker-0", api.WithCount(2)), ), ) } -func TestDockerKubernetes130UpgradeWorkloadClusterLabelsAndTaintsGitHubFluxAPI(t *testing.T) { +func TestDockerKubernetes131UpgradeWorkloadClusterLabelsAndTaintsGitHubFluxAPI(t *testing.T) { provider := framework.NewDocker(t) managementCluster := framework.NewClusterE2ETest( t, provider, framework.WithFluxGithubEnvVarCheck(), framework.WithFluxGithubCleanup(), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithExternalEtcdTopology(1), @@ -1113,7 +1264,7 @@ func TestDockerKubernetes130UpgradeWorkloadClusterLabelsAndTaintsGitHubFluxAPI(t t, provider, framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithManagementCluster(managementCluster.ClusterName), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -1137,13 +1288,13 @@ func TestDockerKubernetes130UpgradeWorkloadClusterLabelsAndTaintsGitHubFluxAPI(t ) } -func TestDockerKubernetes130UpgradeWorkloadClusterScaleAddRemoveWorkerNodeGroupsGitHubFluxAPI(t *testing.T) { +func TestDockerKubernetes131UpgradeWorkloadClusterScaleAddRemoveWorkerNodeGroupsGitHubFluxAPI(t *testing.T) { provider := framework.NewDocker(t) managementCluster := framework.NewClusterE2ETest( t, provider, framework.WithFluxGithubEnvVarCheck(), framework.WithFluxGithubCleanup(), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), api.WithExternalEtcdTopology(1), @@ -1159,7 +1310,7 @@ func TestDockerKubernetes130UpgradeWorkloadClusterScaleAddRemoveWorkerNodeGroups t, provider, framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithManagementCluster(managementCluster.ClusterName), api.WithControlPlaneCount(1), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -1182,6 +1333,7 @@ func TestDockerKubernetes130UpgradeWorkloadClusterScaleAddRemoveWorkerNodeGroups ) } +// Cilium Skip Upgrade func TestDockerCiliumSkipUpgrade_CLICreate(t *testing.T) { provider := framework.NewDocker(t) test := framework.NewClusterE2ETest(t, provider, @@ -1361,13 +1513,13 @@ func TestDockerKubernetesUpgradeManagementComponents(t *testing.T) { runUpgradeManagementComponentsFlow(t, release, provider, v1alpha1.Kube128, "") } -// etcd scale tests -func TestDockerKubernetes130EtcdScaleUp(t *testing.T) { +// Etcd Scale tests +func TestDockerKubernetes131EtcdScaleUp(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewDocker(t), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), @@ -1376,19 +1528,19 @@ func TestDockerKubernetes130EtcdScaleUp(t *testing.T) { runSimpleUpgradeFlow( test, - v1alpha1.Kube130, + v1alpha1.Kube131, framework.WithClusterUpgrade( api.WithExternalEtcdTopology(3), ), ) } -func TestDockerKubernetes130EtcdScaleDown(t *testing.T) { +func TestDockerKubernetes131EtcdScaleDown(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewDocker(t), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithExternalEtcdTopology(3), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), @@ -1397,20 +1549,20 @@ func TestDockerKubernetes130EtcdScaleDown(t *testing.T) { runSimpleUpgradeFlow( test, - v1alpha1.Kube130, + v1alpha1.Kube131, framework.WithClusterUpgrade( api.WithExternalEtcdTopology(1), ), ) } -func TestDockerKubernetes129to130EtcdScaleUp(t *testing.T) { +func TestDockerKubernetes130to131EtcdScaleUp(t *testing.T) { provider := framework.NewDocker(t) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithExternalEtcdTopology(1), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), @@ -1419,21 +1571,21 @@ func TestDockerKubernetes129to130EtcdScaleUp(t *testing.T) { runSimpleUpgradeFlow( test, - v1alpha1.Kube130, + v1alpha1.Kube131, framework.WithClusterUpgrade( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithExternalEtcdTopology(3), ), ) } -func TestDockerKubernetes129to130EtcdScaleDown(t *testing.T) { +func TestDockerKubernetes130to131EtcdScaleDown(t *testing.T) { provider := framework.NewDocker(t) test := framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithExternalEtcdTopology(3), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), @@ -1442,15 +1594,15 @@ func TestDockerKubernetes129to130EtcdScaleDown(t *testing.T) { runSimpleUpgradeFlow( test, - v1alpha1.Kube130, + v1alpha1.Kube131, framework.WithClusterUpgrade( - api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithKubernetesVersion(v1alpha1.Kube131), api.WithExternalEtcdTopology(1), ), ) } -// Kubelet Configuration e2e tests +// Kubelet Configuration tests func TestDockerKubernetes129KubeletConfigurationSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1470,3 +1622,13 @@ func TestDockerKubernetes130KubeletConfigurationSimpleFlow(t *testing.T) { ) runKubeletConfigurationFlow(test) } + +func TestDockerKubernetes131KubeletConfigurationSimpleFlow(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewDocker(t), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube131)), + framework.WithKubeletConfig(), + ) + runKubeletConfigurationFlow(test) +}