From 4b49215cc8e8688f88c747d0840900b16f4c0830 Mon Sep 17 00:00:00 2001 From: Rahul Ganesh <31204974+rahulbabu95@users.noreply.github.com> Date: Tue, 21 May 2024 13:18:17 -0700 Subject: [PATCH] Add 1.29 E2E for Tinkerbell (#8169) Signed-off-by: Rahul Ganesh Co-authored-by: Rahul Ganesh --- .../build/buildspecs/quick-test-eks-a-cli.yml | 3 + .../buildspecs/tinkerbell-test-eks-a-cli.yml | 3 + test/e2e/QUICK_TESTS.yaml | 6 +- test/e2e/SKIPPED_TESTS.yaml | 23 +- test/e2e/TINKERBELL_HARDWARE_COUNT.yaml | 87 ++-- test/e2e/tinkerbell_test.go | 488 +++++++++--------- test/framework/tinkerbell.go | 42 +- 7 files changed, 354 insertions(+), 298 deletions(-) diff --git a/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml index d17f786e86e6..c69cd496f74b 100644 --- a/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml @@ -138,18 +138,21 @@ env: T_TINKERBELL_IMAGE_UBUNTU_1_27: "tinkerbell_ci:image_ubuntu_1_27" T_TINKERBELL_IMAGE_UBUNTU_1_28: "tinkerbell_ci:image_ubuntu_1_28" T_TINKERBELL_IMAGE_UBUNTU_1_29: "tinkerbell_ci:image_ubuntu_1_29" + T_TINKERBELL_IMAGE_UBUNTU_1_30: "tinkerbell_ci:image_ubuntu_1_30" T_TINKERBELL_IMAGE_UBUNTU_2204_1_24: "tinkerbell_ci:image_ubuntu_2204_1_24" T_TINKERBELL_IMAGE_UBUNTU_2204_1_25: "tinkerbell_ci:image_ubuntu_2204_1_25" T_TINKERBELL_IMAGE_UBUNTU_2204_1_26: "tinkerbell_ci:image_ubuntu_2204_1_26" T_TINKERBELL_IMAGE_UBUNTU_2204_1_27: "tinkerbell_ci:image_ubuntu_2204_1_27" T_TINKERBELL_IMAGE_UBUNTU_2204_1_28: "tinkerbell_ci:image_ubuntu_2204_1_28" T_TINKERBELL_IMAGE_UBUNTU_2204_1_29: "tinkerbell_ci:image_ubuntu_2204_1_29" + T_TINKERBELL_IMAGE_UBUNTU_2204_1_30: "tinkerbell_ci:image_ubuntu_2204_1_30" T_TINKERBELL_IMAGE_REDHAT_1_24: "tinkerbell_ci:image_redhat_1_24" T_TINKERBELL_IMAGE_REDHAT_1_25: "tinkerbell_ci:image_redhat_1_25" T_TINKERBELL_IMAGE_REDHAT_1_26: "tinkerbell_ci:image_redhat_1_26" T_TINKERBELL_IMAGE_REDHAT_1_27: "tinkerbell_ci:image_redhat_1_27" T_TINKERBELL_IMAGE_REDHAT_1_28: "tinkerbell_ci:image_redhat_1_28" T_TINKERBELL_IMAGE_REDHAT_1_29: "tinkerbell_ci:image_redhat_1_29" + T_TINKERBELL_IMAGE_REDHAT_1_30: "tinkerbell_ci:image_redhat_1_30" T_TINKERBELL_SSH_AUTHORIZED_KEY: "vsphere_ci_beta_connection:ssh_authorized_key" T_TINKERBELL_CP_NETWORK_CIDR: "tinkerbell_ci:cp_network_cidr" T_TINKERBELL_S3_INVENTORY_CSV_KEY: "tinkerbell_ci:s3_inventory_csv" diff --git a/cmd/integration_test/build/buildspecs/tinkerbell-test-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/tinkerbell-test-eks-a-cli.yml index 128163ae111d..67f9c5ffdddb 100644 --- a/cmd/integration_test/build/buildspecs/tinkerbell-test-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/tinkerbell-test-eks-a-cli.yml @@ -37,18 +37,21 @@ env: T_TINKERBELL_IMAGE_UBUNTU_1_27: "tinkerbell_ci:image_ubuntu_1_27" T_TINKERBELL_IMAGE_UBUNTU_1_28: "tinkerbell_ci:image_ubuntu_1_28" T_TINKERBELL_IMAGE_UBUNTU_1_29: "tinkerbell_ci:image_ubuntu_1_29" + T_TINKERBELL_IMAGE_UBUNTU_1_30: "tinkerbell_ci:image_ubuntu_1_30" T_TINKERBELL_IMAGE_UBUNTU_2204_1_24: "tinkerbell_ci:image_ubuntu_2204_1_24" T_TINKERBELL_IMAGE_UBUNTU_2204_1_25: "tinkerbell_ci:image_ubuntu_2204_1_25" T_TINKERBELL_IMAGE_UBUNTU_2204_1_26: "tinkerbell_ci:image_ubuntu_2204_1_26" T_TINKERBELL_IMAGE_UBUNTU_2204_1_27: "tinkerbell_ci:image_ubuntu_2204_1_27" T_TINKERBELL_IMAGE_UBUNTU_2204_1_28: "tinkerbell_ci:image_ubuntu_2204_1_28" T_TINKERBELL_IMAGE_UBUNTU_2204_1_29: "tinkerbell_ci:image_ubuntu_2204_1_29" + T_TINKERBELL_IMAGE_UBUNTU_2204_1_30: "tinkerbell_ci:image_ubuntu_2204_1_30" T_TINKERBELL_IMAGE_REDHAT_1_24: "tinkerbell_ci:image_redhat_1_24" T_TINKERBELL_IMAGE_REDHAT_1_25: "tinkerbell_ci:image_redhat_1_25" T_TINKERBELL_IMAGE_REDHAT_1_26: "tinkerbell_ci:image_redhat_1_26" T_TINKERBELL_IMAGE_REDHAT_1_27: "tinkerbell_ci:image_redhat_1_27" T_TINKERBELL_IMAGE_REDHAT_1_28: "tinkerbell_ci:image_redhat_1_28" T_TINKERBELL_IMAGE_REDHAT_1_29: "tinkerbell_ci:image_redhat_1_29" + T_TINKERBELL_IMAGE_REDHAT_1_30: "tinkerbell_ci:image_redhat_1_30" T_TINKERBELL_SSH_AUTHORIZED_KEY: "vsphere_ci_beta_connection:ssh_authorized_key" T_TINKERBELL_CP_NETWORK_CIDR: "tinkerbell_ci:cp_network_cidr" T_TINKERBELL_S3_INVENTORY_CSV_KEY: "tinkerbell_ci:s3_inventory_csv" diff --git a/test/e2e/QUICK_TESTS.yaml b/test/e2e/QUICK_TESTS.yaml index 4fd1f730e565..e59cb8184cbc 100644 --- a/test/e2e/QUICK_TESTS.yaml +++ b/test/e2e/QUICK_TESTS.yaml @@ -25,6 +25,6 @@ quick_tests: # - TestSnowKubernetes128SimpleFlow # - TestSnowKubernetes128StackedEtcdSimpleFlow # Tinkerbell -- ^TestTinkerbellKubernetes128UbuntuTo129Upgrade$ -- TestTinkerbellKubernetes129Ubuntu2004To2204Upgrade -- TestTinkerbellKubernetes128To129Ubuntu2204Upgrade \ No newline at end of file +- ^TestTinkerbellKubernetes129UbuntuTo130Upgrade$ +- TestTinkerbellKubernetes130Ubuntu2004To2204Upgrade +- TestTinkerbellKubernetes129To130Ubuntu2204Upgrade \ No newline at end of file diff --git a/test/e2e/SKIPPED_TESTS.yaml b/test/e2e/SKIPPED_TESTS.yaml index f8f141b41312..22de9114567d 100644 --- a/test/e2e/SKIPPED_TESTS.yaml +++ b/test/e2e/SKIPPED_TESTS.yaml @@ -77,19 +77,18 @@ skipped_tests: - TestTinkerbellKubernetes126UbuntuExternalEtcdSimpleFlow # Skipping skip power action tests - Not going to work because e2e test powers on CP and worker node at the same time and worker node times out early waiting for ipxe # Skipping a few redundant tests -- TestTinkerbellKubernetes125RedHatSimpleFlow - TestTinkerbellKubernetes126RedHatSimpleFlow - TestTinkerbellKubernetes127RedHatSimpleFlow - TestTinkerbellKubernetes128RedHatSimpleFlow - TestTinkerbellKubernetes129RedHatSimpleFlow -- TestTinkerbellKubernetes125UbuntuSimpleFlow +- TestTinkerbellKubernetes130RedHatSimpleFlow - TestTinkerbellKubernetes126UbuntuSimpleFlow -- TestTinkerbellKubernetes125Ubuntu2204SimpleFlow +- TestTinkerbellKubernetes127UbuntuSimpleFlow - TestTinkerbellKubernetes126Ubuntu2204SimpleFlow -- TestTinkerbellKubernetes125To126Ubuntu2204Upgrade +- TestTinkerbellKubernetes127Ubuntu2204SimpleFlow +- TestTinkerbellKubernetes126To127Ubuntu2204Upgrade - TestTinkerbellKubernetes126Ubuntu2004To2204Upgrade -- TestTinkerbellKubernetes126UbuntuThreeWorkersSimpleFlow -- TestTinkerbellKubernetes125UbuntuWorkerNodeScaleUpWithAPI +- TestTinkerbellKubernetes127Ubuntu2004To2204Upgrade - TestTinkerbellKubernetes125UbuntuAddWorkerNodeGroupWithAPI - TestTinkerbellSingleNode125ManagementScaleupWorkloadWithAPI #Skip single K8s version upgrade tests as the same is covered by multiple K8s version upgrade from 1.25 to 1.29 to save on hardware resources and running time @@ -111,12 +110,12 @@ skipped_tests: - TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesHarborFlow - TestTinkerbellKubernetes127UbuntuCuratedPackagesAdotSimpleFlow - TestTinkerbellKubernetes127UbuntuCuratedPackagesPrometheusSimpleFlow -- TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesFlow -- TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesEmissaryFlow -- TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesHarborFlow -- TestTinkerbellKubernetes129UbuntuCuratedPackagesAdotSimpleFlow -- TestTinkerbellKubernetes129UbuntuCuratedPackagesPrometheusSimpleFlow -- TestTinkerbellKubernetes129UbuntuCuratedPackagesClusterAutoscalerSimpleFlow +- TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesFlow +- TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesEmissaryFlow +- TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesHarborFlow +- TestTinkerbellKubernetes130UbuntuCuratedPackagesAdotSimpleFlow +- TestTinkerbellKubernetes130UbuntuCuratedPackagesPrometheusSimpleFlow +- TestTinkerbellKubernetes130UbuntuCuratedPackagesClusterAutoscalerSimpleFlow # Tinkerbell conformance - TestTinkerbellKubernetes125BottleRocketThreeReplicasTwoWorkersConformanceFlow diff --git a/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml b/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml index ec5a7b189bdf..49d1f909819b 100644 --- a/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml +++ b/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml @@ -1,7 +1,7 @@ -TestTinkerbellKubernetes129AWSIamAuth: 2 +TestTinkerbellKubernetes130AWSIamAuth: 2 TestTinkerbellKubernetes128BottleRocketAWSIamAuth: 2 -TestTinkerbellKubernetes129UbuntuWorkerNodeUpgrade: 3 -TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUpWithAPI: 3 +TestTinkerbellKubernetes130UbuntuWorkerNodeUpgrade: 3 +TestTinkerbellKubernetes130UbuntuWorkerNodeScaleUpWithAPI: 3 TestTinkerbellKubernetes125UbuntuAddWorkerNodeGroupWithAPI: 2 TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesFlow: 1 TestTinkerbellKubernetes127BottleRocketSingleNodeCuratedPackagesFlow: 1 @@ -34,97 +34,98 @@ TestTinkerbellKubernetes125UbuntuCuratedPackagesAdotSimpleFlow: 1 TestTinkerbellKubernetes125BottleRocketCuratedPackagesAdotSimpleFlow: 1 TestTinkerbellKubernetes125UbuntuCuratedPackagesPrometheusSimpleFlow: 1 TestTinkerbellKubernetes125BottleRocketCuratedPackagesPrometheusSimpleFlow: 1 -TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesFlow: 1 +TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesFlow: 1 TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesFlow: 1 -TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesEmissaryFlow: 1 +TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesEmissaryFlow: 1 TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesEmissaryFlow: 1 -TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesHarborFlow: 1 +TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesHarborFlow: 1 TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesHarborFlow: 1 -TestTinkerbellKubernetes129UbuntuCuratedPackagesAdotSimpleFlow: 1 +TestTinkerbellKubernetes130UbuntuCuratedPackagesAdotSimpleFlow: 1 TestTinkerbellKubernetes128BottleRocketCuratedPackagesAdotSimpleFlow: 1 -TestTinkerbellKubernetes129UbuntuCuratedPackagesPrometheusSimpleFlow: 1 +TestTinkerbellKubernetes130UbuntuCuratedPackagesPrometheusSimpleFlow: 1 TestTinkerbellKubernetes128BottleRocketCuratedPackagesPrometheusSimpleFlow: 1 -TestTinkerbellKubernetes129UbuntuCuratedPackagesClusterAutoscalerSimpleFlow: 3 +TestTinkerbellKubernetes130UbuntuCuratedPackagesClusterAutoscalerSimpleFlow: 3 TestTinkerbellKubernetes128BottleRocketSingleNodeSimpleFlow: 1 -TestTinkerbellKubernetes129UbuntuSingleNodeSimpleFlow: 1 -TestTinkerbellKubernetes129UbuntuWorkloadCluster: 4 -TestTinkerbellKubernetes129UbuntuWorkloadClusterWithAPI: 4 -TestTinkerbellKubernetes129UbuntuWorkloadClusterGitFluxWithAPI: 4 +TestTinkerbellKubernetes130UbuntuSingleNodeSimpleFlow: 1 +TestTinkerbellKubernetes130UbuntuWorkloadCluster: 4 +TestTinkerbellKubernetes130UbuntuWorkloadClusterWithAPI: 4 +TestTinkerbellKubernetes130UbuntuWorkloadClusterGitFluxWithAPI: 4 TestTinkerbellKubernetes128BottlerocketWorkloadClusterSimpleFlow: 4 TestTinkerbellKubernetes128BottlerocketWorkloadClusterWithAPI: 4 -TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadCluster: 2 -TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadClusterWithAPI: 2 +TestTinkerbellKubernetes130UbuntuSingleNodeWorkloadCluster: 2 +TestTinkerbellKubernetes130UbuntuSingleNodeWorkloadClusterWithAPI: 2 TestTinkerbellKubernetes128BottlerocketSingleNodeWorkloadCluster: 2 TestTinkerbellKubernetes128BottlerocketSingleNodeWorkloadClusterWithAPI: 2 TestTinkerbellKubernetes128BottlerocketWorkloadClusterSkipPowerActions: 4 -TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleup: 5 +TestTinkerbellUpgrade130MulticlusterWorkloadClusterWorkerScaleup: 5 TestTinkerbellSingleNode125ManagementScaleupWorkloadWithAPI: 4 -TestTinkerbellKubernetes125UbuntuTo126Upgrade: 4 TestTinkerbellKubernetes126UbuntuTo127Upgrade: 4 TestTinkerbellKubernetes127UbuntuTo128Upgrade: 4 TestTinkerbellKubernetes128UbuntuTo129Upgrade: 4 -TestTinkerbellKubernetes125To126Ubuntu2204Upgrade: 4 +TestTinkerbellKubernetes129UbuntuTo130Upgrade: 4 TestTinkerbellKubernetes126To127Ubuntu2204Upgrade: 4 TestTinkerbellKubernetes127To128Ubuntu2204Upgrade: 4 TestTinkerbellKubernetes128To129Ubuntu2204Upgrade: 4 +TestTinkerbellKubernetes129To130Ubuntu2204Upgrade: 4 TestTinkerbellKubernetes126Ubuntu2004To2204Upgrade: 4 TestTinkerbellKubernetes127Ubuntu2004To2204Upgrade: 4 TestTinkerbellKubernetes128Ubuntu2004To2204Upgrade: 4 TestTinkerbellKubernetes129Ubuntu2004To2204Upgrade: 4 -TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI: 4 -TestTinkerbellUpgrade129MulticlusterWorkloadClusterCPScaleup: 6 -TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade128To129: 6 +TestTinkerbellKubernetes130Ubuntu2004To2204Upgrade: 4 +TestTinkerbellUpgrade130MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI: 4 +TestTinkerbellUpgrade130MulticlusterWorkloadClusterCPScaleup: 6 +TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade129To130: 6 TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade125To126WithAPI: 4 -TestTinkerbellKubernetes129OIDC: 2 -TestTinkerbellKubernetes129UbuntuRegistryMirror: 2 -TestTinkerbellKubernetes129UbuntuInsecureSkipVerifyRegistryMirror: 2 +TestTinkerbellKubernetes130OIDC: 2 +TestTinkerbellKubernetes130UbuntuRegistryMirror: 2 +TestTinkerbellKubernetes130UbuntuInsecureSkipVerifyRegistryMirror: 2 TestTinkerbellKubernetes128BottlerocketRegistryMirror: 2 -TestTinkerbellKubernetes129UbuntuAuthenticatedRegistryMirror: 2 +TestTinkerbellKubernetes130UbuntuAuthenticatedRegistryMirror: 2 TestTinkerbellKubernetes128BottlerocketAuthenticatedRegistryMirror: 2 -TestTinkerbellKubernetes125UbuntuSimpleFlow: 2 TestTinkerbellKubernetes126UbuntuSimpleFlow: 2 TestTinkerbellKubernetes127UbuntuSimpleFlow: 2 TestTinkerbellKubernetes128UbuntuSimpleFlow: 2 TestTinkerbellKubernetes129UbuntuSimpleFlow: 2 -TestTinkerbellKubernetes125Ubuntu2204SimpleFlow: 2 +TestTinkerbellKubernetes130UbuntuSimpleFlow: 2 TestTinkerbellKubernetes126Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes127Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes128Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes129Ubuntu2204SimpleFlow: 2 -TestTinkerbellKubernetes125RedHatSimpleFlow: 2 +TestTinkerbellKubernetes130Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes126RedHatSimpleFlow: 2 TestTinkerbellKubernetes127RedHatSimpleFlow: 2 TestTinkerbellKubernetes128RedHatSimpleFlow: 2 TestTinkerbellKubernetes129RedHatSimpleFlow: 2 +TestTinkerbellKubernetes130RedHatSimpleFlow: 2 TestTinkerbellKubernetes125BottleRocketSimpleFlow: 2 TestTinkerbellKubernetes126BottleRocketSimpleFlow: 2 TestTinkerbellKubernetes127BottleRocketSimpleFlow: 2 TestTinkerbellKubernetes128BottleRocketSimpleFlow: 2 -TestTinkerbellKubernetes129UbuntuThreeControlPlaneReplicasSimpleFlow: 4 +TestTinkerbellKubernetes130UbuntuThreeControlPlaneReplicasSimpleFlow: 4 TestTinkerbellKubernetes128BottleRocketThreeControlPlaneReplicasSimpleFlow: 4 -TestTinkerbellKubernetes129UbuntuThreeWorkersSimpleFlow: 4 +TestTinkerbellKubernetes130UbuntuThreeWorkersSimpleFlow: 4 TestTinkerbellKubernetes128BottleRocketThreeWorkersSimpleFlow: 4 -TestTinkerbellKubernetes129UbuntuControlPlaneScaleUp: 4 -TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUp: 3 -TestTinkerbellKubernetes129UbuntuWorkerNodeScaleDown: 3 -TestTinkerbellKubernetes129UbuntuControlPlaneScaleDown: 4 -TestTinkerbellKubernetes129UbuntuWorkerNodeGroupsTaintsAndLabels: 3 +TestTinkerbellKubernetes130UbuntuControlPlaneScaleUp: 4 +TestTinkerbellKubernetes130UbuntuWorkerNodeScaleUp: 3 +TestTinkerbellKubernetes130UbuntuWorkerNodeScaleDown: 3 +TestTinkerbellKubernetes130UbuntuControlPlaneScaleDown: 4 +TestTinkerbellKubernetes130UbuntuWorkerNodeGroupsTaintsAndLabels: 3 TestTinkerbellKubernetes128BottlerocketWorkerNodeGroupsTaintsAndLabels: 3 TestTinkerbellAirgappedKubernetes128BottleRocketRegistryMirror: 2 TestTinkerbellAirgappedKubernetes128BottlerocketProxyConfigFlow: 2 -TestTinkerbellAirgappedKubernetes129UbuntuProxyConfigFlow: 2 -TestTinkerbellKubernetes129UbuntuOOB: 2 -TestTinkerbellK8sUpgrade128to129WithUbuntuOOB: 4 -TestTinkerbellKubernetes128UbuntuTo129UpgradeCPOnly: 3 -TestTinkerbellKubernetes127UbuntuTo128UpgradeWorkerOnly: 3 -TestTinkerbellSingleNode128To129UbuntuManagementCPUpgradeAPI: 4 -TestTinkerbellKubernetes125UbuntuTo126InPlaceUpgrade_1CP_1Worker: 2 +TestTinkerbellAirgappedKubernetes130UbuntuProxyConfigFlow: 2 +TestTinkerbellKubernetes130UbuntuOOB: 2 +TestTinkerbellK8sUpgrade129to130WithUbuntuOOB: 4 +TestTinkerbellKubernetes129UbuntuTo130UpgradeCPOnly: 3 +TestTinkerbellKubernetes129UbuntuTo130UpgradeWorkerOnly: 3 +TestTinkerbellSingleNode129To130UbuntuManagementCPUpgradeAPI: 4 TestTinkerbellKubernetes126UbuntuTo127InPlaceUpgrade_1CP_2Worker: 3 TestTinkerbellKubernetes127UbuntuTo128InPlaceUpgrade_3CP_1Worker: 4 TestTinkerbellKubernetes128UbuntuTo129InPlaceUpgrade_1CP_1Worker: 2 -TestTinkerbellKubernetes125UbuntuTo126SingleNodeInPlaceUpgrade: 1 +TestTinkerbellKubernetes129UbuntuTo130InPlaceUpgrade_1CP_1Worker: 2 TestTinkerbellKubernetes126UbuntuTo127SingleNodeInPlaceUpgrade: 1 TestTinkerbellKubernetes127UbuntuTo128SingleNodeInPlaceUpgrade: 1 TestTinkerbellKubernetes128UbuntuTo129SingleNodeInPlaceUpgrade: 1 +TestTinkerbellKubernetes129UbuntuTo130SingleNodeInPlaceUpgrade: 1 TestTinkerbellKubernetes128UpgradeManagementComponents: 2 TestTinkerbellKubernetes125UbuntuTo129MultipleUpgrade: 4 \ No newline at end of file diff --git a/test/e2e/tinkerbell_test.go b/test/e2e/tinkerbell_test.go index 99cc9281942f..bf25eafc4a0c 100644 --- a/test/e2e/tinkerbell_test.go +++ b/test/e2e/tinkerbell_test.go @@ -19,12 +19,12 @@ import ( // AWS IAM Auth -func TestTinkerbellKubernetes129AWSIamAuth(t *testing.T) { +func TestTinkerbellKubernetes130AWSIamAuth(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), framework.WithAWSIam(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), ) @@ -32,25 +32,6 @@ func TestTinkerbellKubernetes129AWSIamAuth(t *testing.T) { } // Upgrade -func TestTinkerbellKubernetes125UbuntuTo126Upgrade(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu125Tinkerbell()) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube125)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithControlPlaneHardware(2), - framework.WithWorkerHardware(2), - ) - runSimpleUpgradeFlowForBareMetal( - test, - v1alpha1.Kube126, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube126)), - provider.WithProviderUpgrade(framework.Ubuntu126Image()), - ) -} - func TestTinkerbellKubernetes126UbuntuTo127Upgrade(t *testing.T) { provider := framework.NewTinkerbell(t, framework.WithUbuntu126Tinkerbell()) test := framework.NewClusterE2ETest( @@ -108,71 +89,70 @@ func TestTinkerbellKubernetes128UbuntuTo129Upgrade(t *testing.T) { ) } -func TestTinkerbellKubernetes128UbuntuTo129UpgradeCPOnly(t *testing.T) { - provider := framework.NewTinkerbell(t) - kube128 := v1alpha1.Kube128 +func TestTinkerbellKubernetes129UbuntuTo130Upgrade(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithClusterFiller(api.WithWorkerKubernetesVersion(nodeGroupLabel1, &kube128)), framework.WithControlPlaneHardware(2), - framework.WithWorkerHardware(1), - ).WithClusterConfig( - provider.WithCPKubeVersionAndOS(kube128, framework.Ubuntu2004), - provider.WithWorkerKubeVersionAndOS(kube128, framework.Ubuntu2004), + framework.WithWorkerHardware(2), ) - runSimpleUpgradeFlowWorkerNodeVersionForBareMetal( + runSimpleUpgradeFlowForBareMetal( test, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129)), - provider.WithProviderUpgrade(framework.Ubuntu129ImageForCP()), + v1alpha1.Kube130, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)), + provider.WithProviderUpgrade(framework.Ubuntu130Image()), ) } -func TestTinkerbellKubernetes127UbuntuTo128UpgradeWorkerOnly(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuTo130UpgradeCPOnly(t *testing.T) { provider := framework.NewTinkerbell(t) - kube127 := v1alpha1.Kube127 - kube128 := v1alpha1.Kube128 + kube129 := v1alpha1.Kube129 test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(), - framework.WithClusterFiller(api.WithKubernetesVersion(kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(kube129)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithClusterFiller(api.WithWorkerKubernetesVersion(nodeGroupLabel1, &kube127)), - framework.WithControlPlaneHardware(1), - framework.WithWorkerHardware(2), + framework.WithClusterFiller(api.WithWorkerKubernetesVersion(nodeGroupLabel1, &kube129)), + framework.WithControlPlaneHardware(2), + framework.WithWorkerHardware(1), ).WithClusterConfig( - provider.WithCPKubeVersionAndOS(v1alpha1.Kube128, framework.Ubuntu2004), - provider.WithWorkerKubeVersionAndOS(v1alpha1.Kube127, framework.Ubuntu2004), + provider.WithCPKubeVersionAndOS(kube129, framework.Ubuntu2004), + provider.WithWorkerKubeVersionAndOS(kube129, framework.Ubuntu2004), ) runSimpleUpgradeFlowWorkerNodeVersionForBareMetal( test, - framework.WithClusterUpgrade(api.WithWorkerKubernetesVersion(nodeGroupLabel1, &kube128)), - provider.WithProviderUpgrade(framework.Ubuntu128ImageForWorker()), + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)), + provider.WithProviderUpgrade(framework.Ubuntu130ImageForCP()), ) } -func TestTinkerbellKubernetes125To126Ubuntu2204Upgrade(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuTo130UpgradeWorkerOnly(t *testing.T) { provider := framework.NewTinkerbell(t) + kube129 := v1alpha1.Kube129 + kube130 := v1alpha1.Kube130 test := framework.NewClusterE2ETest( t, provider, + framework.WithClusterFiller(), + framework.WithClusterFiller(api.WithKubernetesVersion(kube129)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithControlPlaneHardware(2), + framework.WithClusterFiller(api.WithWorkerKubernetesVersion(nodeGroupLabel1, &kube129)), + framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(2), ).WithClusterConfig( - provider.WithKubeVersionAndOS(v1alpha1.Kube125, framework.Ubuntu2204, nil), + provider.WithCPKubeVersionAndOS(v1alpha1.Kube130, framework.Ubuntu2004), + provider.WithWorkerKubeVersionAndOS(v1alpha1.Kube129, framework.Ubuntu2004), ) - runSimpleUpgradeFlowForBaremetalWithoutClusterConfigGeneration( + runSimpleUpgradeFlowWorkerNodeVersionForBareMetal( test, - v1alpha1.Kube126, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube126)), - provider.WithProviderUpgrade(framework.Ubuntu2204Kubernetes126Image()), + framework.WithClusterUpgrade(api.WithWorkerKubernetesVersion(nodeGroupLabel1, &kube130)), + provider.WithProviderUpgrade(framework.Ubuntu130ImageForWorker()), ) } @@ -236,6 +216,26 @@ func TestTinkerbellKubernetes128To129Ubuntu2204Upgrade(t *testing.T) { ) } +func TestTinkerbellKubernetes129To130Ubuntu2204Upgrade(t *testing.T) { + provider := framework.NewTinkerbell(t) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + framework.WithControlPlaneHardware(2), + framework.WithWorkerHardware(2), + ).WithClusterConfig( + provider.WithKubeVersionAndOS(v1alpha1.Kube129, framework.Ubuntu2204, nil), + ) + runSimpleUpgradeFlowForBaremetalWithoutClusterConfigGeneration( + test, + v1alpha1.Kube130, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)), + provider.WithProviderUpgrade(framework.Ubuntu2204Kubernetes130Image()), + ) +} + func TestTinkerbellKubernetes126Ubuntu2004To2204Upgrade(t *testing.T) { provider := framework.NewTinkerbell(t) test := framework.NewClusterE2ETest( @@ -316,12 +316,32 @@ func TestTinkerbellKubernetes129Ubuntu2004To2204Upgrade(t *testing.T) { ) } -func TestTinkerbellKubernetes129UbuntuWorkerNodeUpgrade(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130Ubuntu2004To2204Upgrade(t *testing.T) { + provider := framework.NewTinkerbell(t) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + framework.WithControlPlaneHardware(2), + framework.WithWorkerHardware(2), + ).WithClusterConfig( + provider.WithKubeVersionAndOS(v1alpha1.Kube130, framework.Ubuntu2004, nil), + ) + runSimpleUpgradeFlowForBaremetalWithoutClusterConfigGeneration( + test, + v1alpha1.Kube130, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)), + provider.WithProviderUpgrade(framework.Ubuntu2204Kubernetes130Image()), + ) +} + +func TestTinkerbellKubernetes130UbuntuWorkerNodeUpgrade(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithControlPlaneHardware(1), @@ -329,17 +349,17 @@ func TestTinkerbellKubernetes129UbuntuWorkerNodeUpgrade(t *testing.T) { ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube129, + v1alpha1.Kube130, framework.WithClusterUpgrade(api.WithWorkerNodeCount(2)), ) } -func TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUpWithAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130UbuntuWorkerNodeScaleUpWithAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithControlPlaneHardware(1), @@ -380,27 +400,6 @@ func TestTinkerbellKubernetes125UbuntuAddWorkerNodeGroupWithAPI(t *testing.T) { ) } -func TestTinkerbellKubernetes125UbuntuTo126InPlaceUpgrade_1CP_1Worker(t *testing.T) { - provider := framework.NewTinkerbell(t) - test := framework.NewClusterE2ETest( - t, - provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube125)), - framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithClusterFiller(api.WithInPlaceUpgradeStrategy()), - framework.WithControlPlaneHardware(1), - framework.WithWorkerHardware(1), - ).WithClusterConfig( - provider.WithKubeVersionAndOS(v1alpha1.Kube125, framework.Ubuntu2004, nil), - ) - runInPlaceUpgradeFlowForBareMetal( - test, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube126), api.WithInPlaceUpgradeStrategy()), - provider.WithProviderUpgrade(framework.Ubuntu126Image()), - ) -} - func TestTinkerbellKubernetes126UbuntuTo127InPlaceUpgrade_1CP_2Worker(t *testing.T) { provider := framework.NewTinkerbell(t) test := framework.NewClusterE2ETest( @@ -464,32 +463,24 @@ func TestTinkerbellKubernetes128UbuntuTo129InPlaceUpgrade_1CP_1Worker(t *testing ) } -func TestTinkerbellKubernetes125UbuntuTo126SingleNodeInPlaceUpgrade(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuTo130InPlaceUpgrade_1CP_1Worker(t *testing.T) { provider := framework.NewTinkerbell(t) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube125)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), - framework.WithClusterFiller(api.WithEtcdCountIfExternal(0)), - framework.WithClusterFiller(api.RemoveAllWorkerNodeGroups()), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithInPlaceUpgradeStrategy()), framework.WithControlPlaneHardware(1), + framework.WithWorkerHardware(1), ).WithClusterConfig( - provider.WithKubeVersionAndOS(v1alpha1.Kube125, framework.Ubuntu2004, nil), + provider.WithKubeVersionAndOS(v1alpha1.Kube129, framework.Ubuntu2004, nil), ) runInPlaceUpgradeFlowForBareMetal( test, - framework.WithUpgradeClusterConfig( - api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube126), - api.WithInPlaceUpgradeStrategy(), - ), - api.TinkerbellToConfigFiller( - api.RemoveTinkerbellWorkerMachineConfig(), - ), - ), - provider.WithProviderUpgrade(framework.Ubuntu126Image()), + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130), api.WithInPlaceUpgradeStrategy()), + provider.WithProviderUpgrade(framework.Ubuntu130Image()), ) } @@ -580,6 +571,35 @@ func TestTinkerbellKubernetes128UbuntuTo129SingleNodeInPlaceUpgrade(t *testing.T ) } +func TestTinkerbellKubernetes129UbuntuTo130SingleNodeInPlaceUpgrade(t *testing.T) { + provider := framework.NewTinkerbell(t) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterSingleNode(v1alpha1.Kube129), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithEtcdCountIfExternal(0)), + framework.WithClusterFiller(api.RemoveAllWorkerNodeGroups()), + framework.WithClusterFiller(api.WithInPlaceUpgradeStrategy()), + framework.WithControlPlaneHardware(1), + ).WithClusterConfig( + provider.WithKubeVersionAndOS(v1alpha1.Kube129, framework.Ubuntu2004, nil), + ) + runInPlaceUpgradeFlowForBareMetal( + test, + framework.WithUpgradeClusterConfig( + api.ClusterToConfigFiller( + api.WithKubernetesVersion(v1alpha1.Kube130), + api.WithInPlaceUpgradeStrategy(), + ), + api.TinkerbellToConfigFiller( + api.RemoveTinkerbellWorkerMachineConfig(), + ), + ), + provider.WithProviderUpgrade(framework.Ubuntu130Image()), + ) +} + // Curated packages func TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesFlow(t *testing.T) { test := framework.NewClusterE2ETest(t, @@ -783,90 +803,90 @@ func TestTinkerbellKubernetes125UbuntuCuratedPackagesPrometheusSimpleFlow(t *tes runCuratedPackagesPrometheusInstallTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesFlow(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesFlow(t *testing.T) { test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube129), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterSingleNode(v1alpha1.Kube130), framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube130), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runCuratedPackageInstallTinkerbellSingleNodeFlow(test) } -func TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesEmissaryFlow(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesEmissaryFlow(t *testing.T) { test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube129), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterSingleNode(v1alpha1.Kube130), framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube130), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runCuratedPackageEmissaryInstallTinkerbellSingleNodeFlow(test) } -func TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesHarborFlow(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuSingleNodeCuratedPackagesHarborFlow(t *testing.T) { test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube129), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterSingleNode(v1alpha1.Kube130), framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube130), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runCuratedPackageHarborInstallTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes129UbuntuCuratedPackagesAdotSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuCuratedPackagesAdotSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube129), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterSingleNode(v1alpha1.Kube130), framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube130), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runCuratedPackagesAdotInstallTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes129UbuntuCuratedPackagesPrometheusSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuCuratedPackagesPrometheusSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube129), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterSingleNode(v1alpha1.Kube130), framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube130), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runCuratedPackagesPrometheusInstallTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes129UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) minNodes := 1 maxNodes := 2 test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(2), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube130), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runAutoscalerWithMetricsServerTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes129UbuntuSingleNodeSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuSingleNodeSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithControlPlaneCount(1), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), @@ -878,28 +898,28 @@ func TestTinkerbellKubernetes129UbuntuSingleNodeSimpleFlow(t *testing.T) { } // Multicluster -func TestTinkerbellKubernetes129UbuntuWorkloadCluster(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130UbuntuWorkloadCluster(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) test := framework.NewMulticlusterE2ETest( t, framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithControlPlaneHardware(2), framework.WithWorkerHardware(2), ), framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), ), ) runTinkerbellWorkloadClusterFlow(test) } -func TestTinkerbellKubernetes129UbuntuWorkloadClusterWithAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130UbuntuWorkloadClusterWithAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) managementCluster := framework.NewClusterE2ETest( t, provider, @@ -907,7 +927,7 @@ func TestTinkerbellKubernetes129UbuntuWorkloadClusterWithAPI(t *testing.T) { framework.WithWorkerHardware(2), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), ), ) test := framework.NewMulticlusterE2ETest( @@ -921,7 +941,7 @@ func TestTinkerbellKubernetes129UbuntuWorkloadClusterWithAPI(t *testing.T) { framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithManagementCluster(managementCluster.ClusterName), ), ), @@ -929,8 +949,8 @@ func TestTinkerbellKubernetes129UbuntuWorkloadClusterWithAPI(t *testing.T) { runWorkloadClusterWithAPIFlowForBareMetal(test) } -func TestTinkerbellKubernetes129UbuntuWorkloadClusterGitFluxWithAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130UbuntuWorkloadClusterGitFluxWithAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) managementCluster := framework.NewClusterE2ETest( t, provider, @@ -941,7 +961,7 @@ func TestTinkerbellKubernetes129UbuntuWorkloadClusterGitFluxWithAPI(t *testing.T ).WithClusterConfig( framework.WithFluxGithubConfig(), api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), ), ) test := framework.NewMulticlusterE2ETest( @@ -955,7 +975,7 @@ func TestTinkerbellKubernetes129UbuntuWorkloadClusterGitFluxWithAPI(t *testing.T framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithManagementCluster(managementCluster.ClusterName), ), ), @@ -1014,15 +1034,15 @@ func TestTinkerbellKubernetes128BottlerocketWorkloadClusterWithAPI(t *testing.T) runWorkloadClusterWithAPIFlowForBareMetal(test) } -func TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadCluster(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130UbuntuSingleNodeWorkloadCluster(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) test := framework.NewMulticlusterE2ETest( t, framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), ), @@ -1033,7 +1053,7 @@ func TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadCluster(t *testing.T) { t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), ), @@ -1042,8 +1062,8 @@ func TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadCluster(t *testing.T) { runTinkerbellWorkloadClusterFlow(test) } -func TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadClusterWithAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130UbuntuSingleNodeWorkloadClusterWithAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) managementCluster := framework.NewClusterE2ETest( t, provider, @@ -1051,7 +1071,7 @@ func TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadClusterWithAPI(t *testin framework.WithWorkerHardware(0), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), ), @@ -1067,7 +1087,7 @@ func TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadClusterWithAPI(t *testin framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithManagementCluster(managementCluster.ClusterName), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), @@ -1077,8 +1097,8 @@ func TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadClusterWithAPI(t *testin runWorkloadClusterWithAPIFlowForBareMetal(test) } -func TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellUpgrade130MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) managementCluster := framework.NewClusterE2ETest( t, provider, @@ -1089,7 +1109,7 @@ func TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleupGitFluxWith ).WithClusterConfig( framework.WithFluxGithubConfig(), api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.RemoveAllWorkerNodeGroups(), ), ) @@ -1104,7 +1124,7 @@ func TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleupGitFluxWith framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithManagementCluster(managementCluster.ClusterName), ), ), @@ -1116,65 +1136,65 @@ func TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleupGitFluxWith ) } -func TestTinkerbellUpgrade129MulticlusterWorkloadClusterCPScaleup(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellUpgrade130MulticlusterWorkloadClusterCPScaleup(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) test := framework.NewMulticlusterE2ETest( t, framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithControlPlaneHardware(4), framework.WithWorkerHardware(2), ), framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), ), ) runSimpleWorkloadUpgradeFlowForBareMetal( test, - v1alpha1.Kube129, + v1alpha1.Kube130, framework.WithClusterUpgrade( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithControlPlaneCount(3), ), ) } -func TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade128To129(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade129To130(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) test := framework.NewMulticlusterE2ETest( t, framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithControlPlaneHardware(3), framework.WithWorkerHardware(3), ), framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), ), ) runSimpleWorkloadUpgradeFlowForBareMetal( test, - v1alpha1.Kube129, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129)), - provider.WithProviderUpgrade(framework.Ubuntu129Image()), + v1alpha1.Kube130, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)), + provider.WithProviderUpgrade(framework.Ubuntu130Image()), ) } // OIDC -func TestTinkerbellKubernetes129OIDC(t *testing.T) { +func TestTinkerbellKubernetes130OIDC(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), framework.WithOIDC(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), ) @@ -1182,11 +1202,11 @@ func TestTinkerbellKubernetes129OIDC(t *testing.T) { } // Registry mirror -func TestTinkerbellKubernetes129UbuntuRegistryMirror(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuRegistryMirror(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), framework.WithRegistryMirrorEndpointAndCert(constants.TinkerbellProviderName), @@ -1194,11 +1214,11 @@ func TestTinkerbellKubernetes129UbuntuRegistryMirror(t *testing.T) { runTinkerbellRegistryMirrorFlow(test) } -func TestTinkerbellKubernetes129UbuntuInsecureSkipVerifyRegistryMirror(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuInsecureSkipVerifyRegistryMirror(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), framework.WithRegistryMirrorInsecureSkipVerify(constants.TinkerbellProviderName), @@ -1206,11 +1226,11 @@ func TestTinkerbellKubernetes129UbuntuInsecureSkipVerifyRegistryMirror(t *testin runTinkerbellRegistryMirrorFlow(test) } -func TestTinkerbellKubernetes129UbuntuAuthenticatedRegistryMirror(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuAuthenticatedRegistryMirror(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), framework.WithAuthenticatedRegistryMirror(constants.TinkerbellProviderName), @@ -1219,17 +1239,6 @@ func TestTinkerbellKubernetes129UbuntuAuthenticatedRegistryMirror(t *testing.T) } // Simpleflow -func TestTinkerbellKubernetes125UbuntuSimpleFlow(t *testing.T) { - test := framework.NewClusterE2ETest( - t, - framework.NewTinkerbell(t, framework.WithUbuntu125Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube125)), - framework.WithControlPlaneHardware(1), - framework.WithWorkerHardware(1), - ) - runTinkerbellSimpleFlow(test) -} - func TestTinkerbellKubernetes126UbuntuSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1274,17 +1283,15 @@ func TestTinkerbellKubernetes129UbuntuSimpleFlow(t *testing.T) { runTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes125Ubuntu2204SimpleFlow(t *testing.T) { - provider := framework.NewTinkerbell(t) +func TestTinkerbellKubernetes130UbuntuSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - provider, + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), - ).WithClusterConfig( - provider.WithKubeVersionAndOS(v1alpha1.Kube125, framework.Ubuntu2204, nil), ) - runTinkerbellSimpleFlowWithoutClusterConfigGeneration(test) + runTinkerbellSimpleFlow(test) } func TestTinkerbellKubernetes126Ubuntu2204SimpleFlow(t *testing.T) { @@ -1339,15 +1346,17 @@ func TestTinkerbellKubernetes129Ubuntu2204SimpleFlow(t *testing.T) { runTinkerbellSimpleFlowWithoutClusterConfigGeneration(test) } -func TestTinkerbellKubernetes125RedHatSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes130Ubuntu2204SimpleFlow(t *testing.T) { + provider := framework.NewTinkerbell(t) test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithRedHat125Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube125)), + provider, framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), + ).WithClusterConfig( + provider.WithKubeVersionAndOS(v1alpha1.Kube130, framework.Ubuntu2204, nil), ) - runTinkerbellSimpleFlow(test) + runTinkerbellSimpleFlowWithoutClusterConfigGeneration(test) } func TestTinkerbellKubernetes126RedHatSimpleFlow(t *testing.T) { @@ -1394,6 +1403,17 @@ func TestTinkerbellKubernetes129RedHatSimpleFlow(t *testing.T) { runTinkerbellSimpleFlow(test) } +func TestTinkerbellKubernetes130RedHatSimpleFlow(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewTinkerbell(t, framework.WithRedHat130Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), + framework.WithControlPlaneHardware(1), + framework.WithWorkerHardware(1), + ) + runTinkerbellSimpleFlow(test) +} + func TestTinkerbellKubernetes128BottleRocketSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1405,11 +1425,11 @@ func TestTinkerbellKubernetes128BottleRocketSimpleFlow(t *testing.T) { runTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes129UbuntuThreeControlPlaneReplicasSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuThreeControlPlaneReplicasSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithControlPlaneCount(3)), framework.WithControlPlaneHardware(3), @@ -1418,11 +1438,11 @@ func TestTinkerbellKubernetes129UbuntuThreeControlPlaneReplicasSimpleFlow(t *tes runTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes129UbuntuThreeWorkersSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuThreeWorkersSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithControlPlaneHardware(1), @@ -1431,12 +1451,12 @@ func TestTinkerbellKubernetes129UbuntuThreeWorkersSimpleFlow(t *testing.T) { runTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes129UbuntuControlPlaneScaleUp(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130UbuntuControlPlaneScaleUp(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithControlPlaneHardware(3), @@ -1444,17 +1464,17 @@ func TestTinkerbellKubernetes129UbuntuControlPlaneScaleUp(t *testing.T) { ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube129, + v1alpha1.Kube130, framework.WithClusterUpgrade(api.WithControlPlaneCount(3)), ) } -func TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUp(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130UbuntuWorkerNodeScaleUp(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithControlPlaneHardware(1), @@ -1462,17 +1482,17 @@ func TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUp(t *testing.T) { ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube129, + v1alpha1.Kube130, framework.WithClusterUpgrade(api.WithWorkerNodeCount(2)), ) } -func TestTinkerbellKubernetes129UbuntuWorkerNodeScaleDown(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130UbuntuWorkerNodeScaleDown(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(2)), framework.WithControlPlaneHardware(1), @@ -1480,17 +1500,17 @@ func TestTinkerbellKubernetes129UbuntuWorkerNodeScaleDown(t *testing.T) { ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube129, + v1alpha1.Kube130, framework.WithClusterUpgrade(api.WithWorkerNodeCount(1)), ) } -func TestTinkerbellKubernetes129UbuntuControlPlaneScaleDown(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) +func TestTinkerbellKubernetes130UbuntuControlPlaneScaleDown(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu130Tinkerbell()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithClusterFiller(api.WithControlPlaneCount(3)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithControlPlaneHardware(3), @@ -1498,18 +1518,18 @@ func TestTinkerbellKubernetes129UbuntuControlPlaneScaleDown(t *testing.T) { ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube129, + v1alpha1.Kube130, framework.WithClusterUpgrade(api.WithControlPlaneCount(1)), ) } // Worker nodegroup taints and labels -func TestTinkerbellKubernetes129UbuntuWorkerNodeGroupsTaintsAndLabels(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuWorkerNodeGroupsTaintsAndLabels(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewTinkerbell( t, - framework.WithUbuntu129Tinkerbell(), + framework.WithUbuntu130Tinkerbell(), framework.WithCustomTinkerbellMachineConfig(nodeGroupLabel1), framework.WithCustomTinkerbellMachineConfig(nodeGroupLabel2), ), @@ -1537,23 +1557,23 @@ func TestTinkerbellKubernetes129UbuntuWorkerNodeGroupsTaintsAndLabels(t *testing // Proxy tests -func TestTinkerbellAirgappedKubernetes129UbuntuProxyConfigFlow(t *testing.T) { +func TestTinkerbellAirgappedKubernetes130UbuntuProxyConfigFlow(t *testing.T) { localIp, err := networkutils.GetLocalIP() if err != nil { t.Fatalf("Cannot get admin machine local IP: %v", err) } t.Logf("Admin machine's IP is: %s", localIp) - kubeVersion := strings.Replace(string(v1alpha1.Kube129), ".", "-", 1) + kubeVersion := strings.Replace(string(v1alpha1.Kube130), ".", "-", 1) test := framework.NewClusterE2ETest( t, framework.NewTinkerbell(t, - framework.WithUbuntu129Tinkerbell(), + framework.WithUbuntu130Tinkerbell(), framework.WithHookImagesURLPath("http://"+localIp.String()+":8080"), ), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), ), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), @@ -1564,11 +1584,11 @@ func TestTinkerbellAirgappedKubernetes129UbuntuProxyConfigFlow(t *testing.T) { } // OOB test -func TestTinkerbellKubernetes129UbuntuOOB(t *testing.T) { +func TestTinkerbellKubernetes130UbuntuOOB(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube130)), framework.WithOOBConfiguration(), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), @@ -1576,26 +1596,26 @@ func TestTinkerbellKubernetes129UbuntuOOB(t *testing.T) { runTinkerbellSimpleFlow(test) } -func TestTinkerbellK8sUpgrade128to129WithUbuntuOOB(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellK8sUpgrade129to130WithUbuntuOOB(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithOOBConfiguration(), framework.WithControlPlaneHardware(2), framework.WithWorkerHardware(2), ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube129, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129)), - provider.WithProviderUpgrade(framework.Ubuntu129Image()), + v1alpha1.Kube130, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube130)), + provider.WithProviderUpgrade(framework.Ubuntu130Image()), ) } -func TestTinkerbellSingleNode128To129UbuntuManagementCPUpgradeAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellSingleNode129To130UbuntuManagementCPUpgradeAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) managementCluster := framework.NewClusterE2ETest( t, provider, @@ -1603,7 +1623,7 @@ func TestTinkerbellSingleNode128To129UbuntuManagementCPUpgradeAPI(t *testing.T) framework.WithWorkerHardware(2), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithControlPlaneCount(1), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), @@ -1616,10 +1636,10 @@ func TestTinkerbellSingleNode128To129UbuntuManagementCPUpgradeAPI(t *testing.T) runWorkloadClusterUpgradeFlowWithAPIForBareMetal( test, api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube130), api.WithControlPlaneCount(3), ), - provider.WithKubeVersionAndOS(v1alpha1.Kube129, framework.Ubuntu2004, nil), + provider.WithKubeVersionAndOS(v1alpha1.Kube130, framework.Ubuntu2004, nil), ) } diff --git a/test/framework/tinkerbell.go b/test/framework/tinkerbell.go index 1d56f12ca79f..8c521240c979 100644 --- a/test/framework/tinkerbell.go +++ b/test/framework/tinkerbell.go @@ -16,24 +16,24 @@ const ( tinkerbellProviderName = "tinkerbell" tinkerbellBootstrapIPEnvVar = "T_TINKERBELL_BOOTSTRAP_IP" tinkerbellControlPlaneNetworkCidrEnvVar = "T_TINKERBELL_CP_NETWORK_CIDR" - tinkerbellImageUbuntu124EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_24" tinkerbellImageUbuntu125EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_25" tinkerbellImageUbuntu126EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_26" tinkerbellImageUbuntu127EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_27" tinkerbellImageUbuntu128EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_28" tinkerbellImageUbuntu129EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_29" - tinkerbellImageUbuntu2204Kubernetes124EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_24" + tinkerbellImageUbuntu130EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_1_30" tinkerbellImageUbuntu2204Kubernetes125EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_25" tinkerbellImageUbuntu2204Kubernetes126EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_26" tinkerbellImageUbuntu2204Kubernetes127EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_27" tinkerbellImageUbuntu2204Kubernetes128EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_28" tinkerbellImageUbuntu2204Kubernetes129EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_29" - tinkerbellImageRedHat124EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_24" + tinkerbellImageUbuntu2204Kubernetes130EnvVar = "T_TINKERBELL_IMAGE_UBUNTU_2204_1_30" tinkerbellImageRedHat125EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_25" tinkerbellImageRedHat126EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_26" tinkerbellImageRedHat127EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_27" tinkerbellImageRedHat128EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_28" tinkerbellImageRedHat129EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_29" + tinkerbellImageRedHat130EnvVar = "T_TINKERBELL_IMAGE_REDHAT_1_30" tinkerbellInventoryCsvFilePathEnvVar = "T_TINKERBELL_INVENTORY_CSV" tinkerbellSSHAuthorizedKey = "T_TINKERBELL_SSH_AUTHORIZED_KEY" TinkerbellCIEnvironment = "T_TINKERBELL_CI_ENVIRONMENT" @@ -43,24 +43,24 @@ const ( var requiredTinkerbellEnvVars = []string{ tinkerbellControlPlaneNetworkCidrEnvVar, - tinkerbellImageUbuntu124EnvVar, tinkerbellImageUbuntu125EnvVar, tinkerbellImageUbuntu126EnvVar, tinkerbellImageUbuntu127EnvVar, tinkerbellImageUbuntu128EnvVar, tinkerbellImageUbuntu129EnvVar, - tinkerbellImageUbuntu2204Kubernetes124EnvVar, + tinkerbellImageUbuntu130EnvVar, tinkerbellImageUbuntu2204Kubernetes125EnvVar, tinkerbellImageUbuntu2204Kubernetes126EnvVar, tinkerbellImageUbuntu2204Kubernetes127EnvVar, tinkerbellImageUbuntu2204Kubernetes128EnvVar, tinkerbellImageUbuntu2204Kubernetes129EnvVar, - tinkerbellImageRedHat124EnvVar, + tinkerbellImageUbuntu2204Kubernetes130EnvVar, tinkerbellImageRedHat125EnvVar, tinkerbellImageRedHat126EnvVar, tinkerbellImageRedHat127EnvVar, tinkerbellImageRedHat128EnvVar, tinkerbellImageRedHat129EnvVar, + tinkerbellImageRedHat130EnvVar, tinkerbellInventoryCsvFilePathEnvVar, tinkerbellSSHAuthorizedKey, } @@ -237,6 +237,11 @@ func WithUbuntu129Tinkerbell() TinkerbellOpt { return withKubeVersionAndOS(anywherev1.Kube129, Ubuntu2004, "", nil) } +// WithUbuntu130Tinkerbell tink test with ubuntu 1.30. +func WithUbuntu130Tinkerbell() TinkerbellOpt { + return withKubeVersionAndOS(anywherev1.Kube130, Ubuntu2004, "", nil) +} + // WithRedHat125Tinkerbell tink test with redhat 1.25. func WithRedHat125Tinkerbell() TinkerbellOpt { return withKubeVersionAndOS(anywherev1.Kube125, RedHat8, "", nil) @@ -262,6 +267,11 @@ func WithRedHat129Tinkerbell() TinkerbellOpt { return withKubeVersionAndOS(anywherev1.Kube129, RedHat8, "", nil) } +// WithRedHat130Tinkerbell tink test with redhat 1.30. +func WithRedHat130Tinkerbell() TinkerbellOpt { + return withKubeVersionAndOS(anywherev1.Kube130, RedHat8, "", nil) +} + func WithBottleRocketTinkerbell() TinkerbellOpt { return func(t *Tinkerbell) { t.fillers = append(t.fillers, @@ -344,6 +354,11 @@ func Ubuntu129Image() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube129, Ubuntu2004, "") } +// Ubuntu130Image represents an Ubuntu raw image corresponding to Kubernetes 1.30. +func Ubuntu130Image() api.TinkerbellFiller { + return imageForKubeVersionAndOS(anywherev1.Kube130, Ubuntu2004, "") +} + // Ubuntu126ImageForCP represents an Ubuntu raw image corresponding to Kubernetes 1.28 and is set for CP machine config. func Ubuntu126ImageForCP() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube126, Ubuntu2004, controlPlaneIdentifier) @@ -364,6 +379,11 @@ func Ubuntu129ImageForCP() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube129, Ubuntu2004, controlPlaneIdentifier) } +// Ubuntu130ImageForCP represents an Ubuntu raw image corresponding to Kubernetes 1.30 and is set for CP machine config. +func Ubuntu130ImageForCP() api.TinkerbellFiller { + return imageForKubeVersionAndOS(anywherev1.Kube130, Ubuntu2004, controlPlaneIdentifier) +} + // Ubuntu126ImageForWorker represents an Ubuntu raw image corresponding to Kubernetes 1.28 and is set for worker machine config. func Ubuntu126ImageForWorker() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube126, Ubuntu2004, workerIdentifier) @@ -384,6 +404,11 @@ func Ubuntu129ImageForWorker() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube129, Ubuntu2004, workerIdentifier) } +// Ubuntu130ImageForWorker represents an Ubuntu raw image corresponding to Kubernetes 1.30 and is set for worker machine config. +func Ubuntu130ImageForWorker() api.TinkerbellFiller { + return imageForKubeVersionAndOS(anywherev1.Kube130, Ubuntu2004, workerIdentifier) +} + // Ubuntu2204Kubernetes126Image represents an Ubuntu 22.04 raw image corresponding to Kubernetes 1.26. func Ubuntu2204Kubernetes126Image() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube126, Ubuntu2204, "") @@ -403,3 +428,8 @@ func Ubuntu2204Kubernetes128Image() api.TinkerbellFiller { func Ubuntu2204Kubernetes129Image() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube129, Ubuntu2204, "") } + +// Ubuntu2204Kubernetes130Image represents an Ubuntu 22.04 raw image corresponding to Kubernetes 1.30. +func Ubuntu2204Kubernetes130Image() api.TinkerbellFiller { + return imageForKubeVersionAndOS(anywherev1.Kube130, Ubuntu2204, "") +}