From af7336bf10ea9f1d620313ee975f64e8cc710f08 Mon Sep 17 00:00:00 2001 From: Pankti Shah <58618433+panktishah26@users.noreply.github.com> Date: Thu, 15 Feb 2024 10:36:14 -0800 Subject: [PATCH] Add 1.29 Tinkerbell E2E (#7591) --- .../buildspecs/tinkerbell-test-eks-a-cli.yml | 3 + test/e2e/SKIPPED_TESTS.yaml | 7 + test/e2e/TINKERBELL_HARDWARE_COUNT.yaml | 81 ++-- test/e2e/tinkerbell_test.go | 426 ++++++++++++------ test/framework/tinkerbell.go | 33 +- 5 files changed, 371 insertions(+), 179 deletions(-) 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 b1c973686706..128163ae111d 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 @@ -36,16 +36,19 @@ env: T_TINKERBELL_IMAGE_UBUNTU_1_26: "tinkerbell_ci:image_ubuntu_1_26" 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_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_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_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/SKIPPED_TESTS.yaml b/test/e2e/SKIPPED_TESTS.yaml index 00e370b72980..ebecec9dfaad 100644 --- a/test/e2e/SKIPPED_TESTS.yaml +++ b/test/e2e/SKIPPED_TESTS.yaml @@ -77,6 +77,13 @@ skipped_tests: - TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesHarborFlow - TestTinkerbellKubernetes127UbuntuCuratedPackagesAdotSimpleFlow - TestTinkerbellKubernetes127UbuntuCuratedPackagesPrometheusSimpleFlow +- TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesFlow +- TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesEmissaryFlow +- TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesHarborFlow +- TestTinkerbellKubernetes129UbuntuCuratedPackagesAdotSimpleFlow +- TestTinkerbellKubernetes129UbuntuCuratedPackagesPrometheusSimpleFlow +- TestTinkerbellKubernetes129UbuntuCuratedPackagesClusterAutoscalerSimpleFlow + # Conformance - TestSnowKubernetes123ThreeWorkersConformanceFlow diff --git a/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml b/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml index e9925f363d1e..9fbfd7a86cec 100644 --- a/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml +++ b/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml @@ -1,7 +1,7 @@ -TestTinkerbellKubernetes128AWSIamAuth: 2 +TestTinkerbellKubernetes129AWSIamAuth: 2 TestTinkerbellKubernetes128BottleRocketAWSIamAuth: 2 -TestTinkerbellKubernetes128UbuntuWorkerNodeUpgrade: 3 -TestTinkerbellKubernetes125UbuntuWorkerNodeScaleUpWithAPI: 3 +TestTinkerbellKubernetes129UbuntuWorkerNodeUpgrade: 3 +TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUpWithAPI: 3 TestTinkerbellKubernetes125UbuntuAddWorkerNodeGroupWithAPI: 2 TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesFlow: 1 TestTinkerbellKubernetes127BottleRocketSingleNodeCuratedPackagesFlow: 1 @@ -34,89 +34,96 @@ TestTinkerbellKubernetes125UbuntuCuratedPackagesAdotSimpleFlow: 1 TestTinkerbellKubernetes125BottleRocketCuratedPackagesAdotSimpleFlow: 1 TestTinkerbellKubernetes125UbuntuCuratedPackagesPrometheusSimpleFlow: 1 TestTinkerbellKubernetes125BottleRocketCuratedPackagesPrometheusSimpleFlow: 1 -TestTinkerbellKubernetes128UbuntuSingleNodeCuratedPackagesFlow: 1 +TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesFlow: 1 TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesFlow: 1 -TestTinkerbellKubernetes128UbuntuSingleNodeCuratedPackagesEmissaryFlow: 1 +TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesEmissaryFlow: 1 TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesEmissaryFlow: 1 -TestTinkerbellKubernetes128UbuntuSingleNodeCuratedPackagesHarborFlow: 1 +TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesHarborFlow: 1 TestTinkerbellKubernetes128BottleRocketSingleNodeCuratedPackagesHarborFlow: 1 -TestTinkerbellKubernetes128UbuntuCuratedPackagesAdotSimpleFlow: 1 +TestTinkerbellKubernetes129UbuntuCuratedPackagesAdotSimpleFlow: 1 TestTinkerbellKubernetes128BottleRocketCuratedPackagesAdotSimpleFlow: 1 -TestTinkerbellKubernetes128UbuntuCuratedPackagesPrometheusSimpleFlow: 1 +TestTinkerbellKubernetes129UbuntuCuratedPackagesPrometheusSimpleFlow: 1 TestTinkerbellKubernetes128BottleRocketCuratedPackagesPrometheusSimpleFlow: 1 -TestTinkerbellKubernetes128UbuntuCuratedPackagesClusterAutoscalerSimpleFlow: 3 +TestTinkerbellKubernetes129UbuntuCuratedPackagesClusterAutoscalerSimpleFlow: 3 TestTinkerbellKubernetes128BottleRocketSingleNodeSimpleFlow: 1 -TestTinkerbellKubernetes128UbuntuSingleNodeSimpleFlow: 1 -TestTinkerbellKubernetes128UbuntuWorkloadCluster: 4 -TestTinkerbellKubernetes128UbuntuWorkloadClusterWithAPI: 4 -TestTinkerbellKubernetes128UbuntuWorkloadClusterGitFluxWithAPI: 4 +TestTinkerbellKubernetes129UbuntuSingleNodeSimpleFlow: 1 +TestTinkerbellKubernetes129UbuntuWorkloadCluster: 4 +TestTinkerbellKubernetes129UbuntuWorkloadClusterWithAPI: 4 +TestTinkerbellKubernetes129UbuntuWorkloadClusterGitFluxWithAPI: 4 TestTinkerbellKubernetes128BottlerocketWorkloadClusterSimpleFlow: 4 TestTinkerbellKubernetes128BottlerocketWorkloadClusterWithAPI: 4 -TestTinkerbellKubernetes128UbuntuSingleNodeWorkloadCluster: 2 -TestTinkerbellKubernetes128UbuntuSingleNodeWorkloadClusterWithAPI: 2 +TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadCluster: 2 +TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadClusterWithAPI: 2 TestTinkerbellKubernetes128BottlerocketSingleNodeWorkloadCluster: 2 TestTinkerbellKubernetes128BottlerocketSingleNodeWorkloadClusterWithAPI: 2 TestTinkerbellKubernetes128BottlerocketWorkloadClusterSkipPowerActions: 4 -TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleup: 5 +TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleup: 5 TestTinkerbellSingleNode125ManagementScaleupWorkloadWithAPI: 4 TestTinkerbellKubernetes125UbuntuTo126Upgrade: 4 TestTinkerbellKubernetes126UbuntuTo127Upgrade: 4 TestTinkerbellKubernetes127UbuntuTo128Upgrade: 4 +TestTinkerbellKubernetes128UbuntuTo129Upgrade: 4 TestTinkerbellKubernetes125To126Ubuntu2204Upgrade: 4 TestTinkerbellKubernetes126To127Ubuntu2204Upgrade: 4 TestTinkerbellKubernetes127To128Ubuntu2204Upgrade: 4 +TestTinkerbellKubernetes128To129Ubuntu2204Upgrade: 4 TestTinkerbellKubernetes126Ubuntu2004To2204Upgrade: 4 TestTinkerbellKubernetes127Ubuntu2004To2204Upgrade: 4 TestTinkerbellKubernetes128Ubuntu2004To2204Upgrade: 4 -TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI: 4 -TestTinkerbellUpgrade128MulticlusterWorkloadClusterCPScaleup: 6 -TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleDown: 5 -TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade127To128: 6 +TestTinkerbellKubernetes129Ubuntu2004To2204Upgrade: 4 +TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI: 4 +TestTinkerbellUpgrade129MulticlusterWorkloadClusterCPScaleup: 6 +TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade128To129: 6 TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade125To126WithAPI: 4 -TestTinkerbellKubernetes128OIDC: 2 -TestTinkerbellKubernetes128UbuntuRegistryMirror: 2 -TestTinkerbellKubernetes128UbuntuInsecureSkipVerifyRegistryMirror: 2 +TestTinkerbellKubernetes129OIDC: 2 +TestTinkerbellKubernetes129UbuntuRegistryMirror: 2 +TestTinkerbellKubernetes129UbuntuInsecureSkipVerifyRegistryMirror: 2 TestTinkerbellKubernetes128BottlerocketRegistryMirror: 2 -TestTinkerbellKubernetes128UbuntuAuthenticatedRegistryMirror: 2 +TestTinkerbellKubernetes129UbuntuAuthenticatedRegistryMirror: 2 TestTinkerbellKubernetes128BottlerocketAuthenticatedRegistryMirror: 2 TestTinkerbellKubernetes125UbuntuSimpleFlow: 2 TestTinkerbellKubernetes126UbuntuSimpleFlow: 2 TestTinkerbellKubernetes127UbuntuSimpleFlow: 2 TestTinkerbellKubernetes128UbuntuSimpleFlow: 2 +TestTinkerbellKubernetes129UbuntuSimpleFlow: 2 TestTinkerbellKubernetes125Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes126Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes127Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes128Ubuntu2204SimpleFlow: 2 +TestTinkerbellKubernetes129Ubuntu2204SimpleFlow: 2 TestTinkerbellKubernetes125RedHatSimpleFlow: 2 TestTinkerbellKubernetes126RedHatSimpleFlow: 2 TestTinkerbellKubernetes127RedHatSimpleFlow: 2 TestTinkerbellKubernetes128RedHatSimpleFlow: 2 +TestTinkerbellKubernetes129RedHatSimpleFlow: 2 TestTinkerbellKubernetes125BottleRocketSimpleFlow: 2 TestTinkerbellKubernetes126BottleRocketSimpleFlow: 2 TestTinkerbellKubernetes127BottleRocketSimpleFlow: 2 TestTinkerbellKubernetes128BottleRocketSimpleFlow: 2 -TestTinkerbellKubernetes128UbuntuThreeControlPlaneReplicasSimpleFlow: 4 +TestTinkerbellKubernetes129UbuntuThreeControlPlaneReplicasSimpleFlow: 4 TestTinkerbellKubernetes128BottleRocketThreeControlPlaneReplicasSimpleFlow: 4 -TestTinkerbellKubernetes128UbuntuThreeWorkersSimpleFlow: 4 +TestTinkerbellKubernetes129UbuntuThreeWorkersSimpleFlow: 4 TestTinkerbellKubernetes128BottleRocketThreeWorkersSimpleFlow: 4 -TestTinkerbellKubernetes128UbuntuControlPlaneScaleUp: 4 -TestTinkerbellKubernetes128UbuntuWorkerNodeScaleUp: 3 -TestTinkerbellKubernetes128UbuntuWorkerNodeScaleDown: 3 -TestTinkerbellKubernetes128UbuntuControlPlaneScaleDown: 4 -TestTinkerbellKubernetes128UbuntuWorkerNodeGroupsTaintsAndLabels: 3 +TestTinkerbellKubernetes129UbuntuControlPlaneScaleUp: 4 +TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUp: 3 +TestTinkerbellKubernetes129UbuntuWorkerNodeScaleDown: 3 +TestTinkerbellKubernetes129UbuntuControlPlaneScaleDown: 4 +TestTinkerbellKubernetes129UbuntuWorkerNodeGroupsTaintsAndLabels: 3 TestTinkerbellKubernetes128BottlerocketWorkerNodeGroupsTaintsAndLabels: 3 TestTinkerbellAirgappedKubernetes128BottleRocketRegistryMirror: 2 TestTinkerbellAirgappedKubernetes128BottlerocketProxyConfigFlow: 2 -TestTinkerbellAirgappedKubernetes128UbuntuProxyConfigFlow: 2 -TestTinkerbellKubernetes128UbuntuOOB: 2 -TestTinkerbellK8sUpgrade127to128WithUbuntuOOB: 4 -TestTinkerbellKubernetes127UbuntuTo128UpgradeCPOnly: 3 +TestTinkerbellAirgappedKubernetes129UbuntuProxyConfigFlow: 2 +TestTinkerbellKubernetes129UbuntuOOB: 2 +TestTinkerbellK8sUpgrade128to129WithUbuntuOOB: 4 +TestTinkerbellKubernetes128UbuntuTo129UpgradeCPOnly: 3 TestTinkerbellKubernetes127UbuntuTo128UpgradeWorkerOnly: 3 -TestTinkerbellSingleNode127To128UbuntuManagementCPUpgradeAPI: 4 +TestTinkerbellSingleNode128To129UbuntuManagementCPUpgradeAPI: 4 TestTinkerbellKubernetes125UbuntuTo126InPlaceUpgrade_1CP_1Worker: 2 TestTinkerbellKubernetes126UbuntuTo127InPlaceUpgrade_1CP_2Worker: 3 TestTinkerbellKubernetes127UbuntuTo128InPlaceUpgrade_3CP_1Worker: 4 +TestTinkerbellKubernetes128UbuntuTo129InPlaceUpgrade_3CP_1Worker: 4 TestTinkerbellKubernetes125UbuntuTo126SingleNodeInPlaceUpgrade: 1 TestTinkerbellKubernetes126UbuntuTo127SingleNodeInPlaceUpgrade: 1 TestTinkerbellKubernetes127UbuntuTo128SingleNodeInPlaceUpgrade: 1 -TestTinkerbellKubernetes128UpgradeManagementComponents: 2 \ No newline at end of file +TestTinkerbellKubernetes128UbuntuTo129SingleNodeInPlaceUpgrade: 1 +TestTinkerbellKubernetes129UpgradeManagementComponents: 2 \ No newline at end of file diff --git a/test/e2e/tinkerbell_test.go b/test/e2e/tinkerbell_test.go index f182eb989644..e0fc39f6c21a 100644 --- a/test/e2e/tinkerbell_test.go +++ b/test/e2e/tinkerbell_test.go @@ -19,12 +19,12 @@ import ( // AWS IAM Auth -func TestTinkerbellKubernetes128AWSIamAuth(t *testing.T) { +func TestTinkerbellKubernetes129AWSIamAuth(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), framework.WithAWSIam(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), ) @@ -89,26 +89,45 @@ func TestTinkerbellKubernetes127UbuntuTo128Upgrade(t *testing.T) { ) } -func TestTinkerbellKubernetes127UbuntuTo128UpgradeCPOnly(t *testing.T) { +func TestTinkerbellKubernetes128UbuntuTo129Upgrade(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + framework.WithControlPlaneHardware(2), + framework.WithWorkerHardware(2), + ) + runSimpleUpgradeFlowForBareMetal( + test, + v1alpha1.Kube129, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129)), + provider.WithProviderUpgrade(framework.Ubuntu129Image()), + ) +} + +func TestTinkerbellKubernetes128UbuntuTo129UpgradeCPOnly(t *testing.T) { provider := framework.NewTinkerbell(t) - kube127 := v1alpha1.Kube127 + kube128 := v1alpha1.Kube128 test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(kube127)), + framework.WithClusterFiller(api.WithKubernetesVersion(kube128)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), - framework.WithClusterFiller(api.WithWorkerKubernetesVersion(nodeGroupLabel1, &kube127)), + framework.WithClusterFiller(api.WithWorkerKubernetesVersion(nodeGroupLabel1, &kube128)), framework.WithControlPlaneHardware(2), framework.WithWorkerHardware(1), ).WithClusterConfig( - provider.WithCPKubeVersionAndOS(v1alpha1.Kube127, framework.Ubuntu2004), - provider.WithWorkerKubeVersionAndOS(v1alpha1.Kube127, framework.Ubuntu2004), + provider.WithCPKubeVersionAndOS(kube128, framework.Ubuntu2004), + provider.WithWorkerKubeVersionAndOS(kube128, framework.Ubuntu2004), ) runSimpleUpgradeFlowWorkerNodeVersionForBareMetal( test, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), - provider.WithProviderUpgrade(framework.Ubuntu128ImageForCP()), + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129)), + provider.WithProviderUpgrade(framework.Ubuntu129ImageForCP()), ) } @@ -197,6 +216,26 @@ func TestTinkerbellKubernetes127To128Ubuntu2204Upgrade(t *testing.T) { ) } +func TestTinkerbellKubernetes128To129Ubuntu2204Upgrade(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.Kube128, framework.Ubuntu2204, nil), + ) + runSimpleUpgradeFlowForBaremetalWithoutClusterConfigGeneration( + test, + v1alpha1.Kube129, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129)), + provider.WithProviderUpgrade(framework.Ubuntu2204Kubernetes129Image()), + ) +} + func TestTinkerbellKubernetes126Ubuntu2004To2204Upgrade(t *testing.T) { provider := framework.NewTinkerbell(t) test := framework.NewClusterE2ETest( @@ -257,12 +296,32 @@ func TestTinkerbellKubernetes128Ubuntu2004To2204Upgrade(t *testing.T) { ) } -func TestTinkerbellKubernetes128UbuntuWorkerNodeUpgrade(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellKubernetes129Ubuntu2004To2204Upgrade(t *testing.T) { + provider := framework.NewTinkerbell(t) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithControlPlaneCount(1)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + framework.WithControlPlaneHardware(2), + framework.WithWorkerHardware(2), + ).WithClusterConfig( + provider.WithKubeVersionAndOS(v1alpha1.Kube129, framework.Ubuntu2004, nil), + ) + runSimpleUpgradeFlowForBaremetalWithoutClusterConfigGeneration( + test, + v1alpha1.Kube129, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129)), + provider.WithProviderUpgrade(framework.Ubuntu2204Kubernetes129Image()), + ) +} + +func TestTinkerbellKubernetes129UbuntuWorkerNodeUpgrade(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithControlPlaneHardware(1), @@ -270,17 +329,17 @@ func TestTinkerbellKubernetes128UbuntuWorkerNodeUpgrade(t *testing.T) { ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube128, + v1alpha1.Kube129, framework.WithClusterUpgrade(api.WithWorkerNodeCount(2)), ) } -func TestTinkerbellKubernetes125UbuntuWorkerNodeScaleUpWithAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu125Tinkerbell()) +func TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUpWithAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) 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.WithWorkerNodeCount(1)), framework.WithControlPlaneHardware(1), @@ -384,6 +443,27 @@ func TestTinkerbellKubernetes127UbuntuTo128InPlaceUpgrade_3CP_1Worker(t *testing ) } +func TestTinkerbellKubernetes128UbuntuTo129InPlaceUpgrade_3CP_1Worker(t *testing.T) { + provider := framework.NewTinkerbell(t) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithControlPlaneCount(3)), + framework.WithClusterFiller(api.WithWorkerNodeCount(1)), + framework.WithClusterFiller(api.WithInPlaceUpgradeStrategy()), + framework.WithControlPlaneHardware(3), + framework.WithWorkerHardware(1), + ).WithClusterConfig( + provider.WithKubeVersionAndOS(v1alpha1.Kube128, framework.Ubuntu2004, nil), + ) + runInPlaceUpgradeFlowForBareMetal( + test, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129), api.WithInPlaceUpgradeStrategy()), + provider.WithProviderUpgrade(framework.Ubuntu129Image()), + ) +} + func TestTinkerbellKubernetes125UbuntuTo126SingleNodeInPlaceUpgrade(t *testing.T) { provider := framework.NewTinkerbell(t) test := framework.NewClusterE2ETest( @@ -471,6 +551,35 @@ func TestTinkerbellKubernetes127UbuntuTo128SingleNodeInPlaceUpgrade(t *testing.T ) } +func TestTinkerbellKubernetes128UbuntuTo129SingleNodeInPlaceUpgrade(t *testing.T) { + provider := framework.NewTinkerbell(t) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithClusterSingleNode(v1alpha1.Kube128), + 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.Kube128, framework.Ubuntu2004, nil), + ) + runInPlaceUpgradeFlowForBareMetal( + test, + framework.WithUpgradeClusterConfig( + api.ClusterToConfigFiller( + api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithInPlaceUpgradeStrategy(), + ), + api.TinkerbellToConfigFiller( + api.RemoveTinkerbellWorkerMachineConfig(), + ), + ), + provider.WithProviderUpgrade(framework.Ubuntu129Image()), + ) +} + // Curated packages func TestTinkerbellKubernetes127UbuntuSingleNodeCuratedPackagesFlow(t *testing.T) { test := framework.NewClusterE2ETest(t, @@ -674,90 +783,90 @@ func TestTinkerbellKubernetes125UbuntuCuratedPackagesPrometheusSimpleFlow(t *tes runCuratedPackagesPrometheusInstallTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes128UbuntuSingleNodeCuratedPackagesFlow(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesFlow(t *testing.T) { test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube128), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterSingleNode(v1alpha1.Kube129), framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runCuratedPackageInstallTinkerbellSingleNodeFlow(test) } -func TestTinkerbellKubernetes128UbuntuSingleNodeCuratedPackagesEmissaryFlow(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesEmissaryFlow(t *testing.T) { test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube128), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterSingleNode(v1alpha1.Kube129), framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runCuratedPackageEmissaryInstallTinkerbellSingleNodeFlow(test) } -func TestTinkerbellKubernetes128UbuntuSingleNodeCuratedPackagesHarborFlow(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuSingleNodeCuratedPackagesHarborFlow(t *testing.T) { test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube128), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterSingleNode(v1alpha1.Kube129), framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runCuratedPackageHarborInstallTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes128UbuntuCuratedPackagesAdotSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuCuratedPackagesAdotSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube128), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterSingleNode(v1alpha1.Kube129), framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runCuratedPackagesAdotInstallTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes128UbuntuCuratedPackagesPrometheusSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuCuratedPackagesPrometheusSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterSingleNode(v1alpha1.Kube128), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterSingleNode(v1alpha1.Kube129), framework.WithControlPlaneHardware(1), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runCuratedPackagesPrometheusInstallTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes128UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuCuratedPackagesClusterAutoscalerSimpleFlow(t *testing.T) { framework.CheckCuratedPackagesCredentials(t) minNodes := 1 maxNodes := 2 test := framework.NewClusterE2ETest(t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129), api.WithWorkerNodeAutoScalingConfig(minNodes, maxNodes)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(2), - framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube128), + framework.WithPackageConfig(t, packageBundleURI(v1alpha1.Kube129), EksaPackageControllerHelmChartName, EksaPackageControllerHelmURI, EksaPackageControllerHelmVersion, EksaPackageControllerHelmValues, nil), ) runAutoscalerWithMetricsServerTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes128UbuntuSingleNodeSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuSingleNodeSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithControlPlaneCount(1), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), @@ -769,28 +878,28 @@ func TestTinkerbellKubernetes128UbuntuSingleNodeSimpleFlow(t *testing.T) { } // Multicluster -func TestTinkerbellKubernetes128UbuntuWorkloadCluster(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellKubernetes129UbuntuWorkloadCluster(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(2), framework.WithWorkerHardware(2), ), framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), ), ) runTinkerbellWorkloadClusterFlow(test) } -func TestTinkerbellKubernetes128UbuntuWorkloadClusterWithAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellKubernetes129UbuntuWorkloadClusterWithAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) managementCluster := framework.NewClusterE2ETest( t, provider, @@ -798,7 +907,7 @@ func TestTinkerbellKubernetes128UbuntuWorkloadClusterWithAPI(t *testing.T) { framework.WithWorkerHardware(2), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), ), ) test := framework.NewMulticlusterE2ETest( @@ -812,7 +921,7 @@ func TestTinkerbellKubernetes128UbuntuWorkloadClusterWithAPI(t *testing.T) { framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithManagementCluster(managementCluster.ClusterName), ), ), @@ -820,8 +929,8 @@ func TestTinkerbellKubernetes128UbuntuWorkloadClusterWithAPI(t *testing.T) { runWorkloadClusterWithAPIFlowForBareMetal(test) } -func TestTinkerbellKubernetes128UbuntuWorkloadClusterGitFluxWithAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellKubernetes129UbuntuWorkloadClusterGitFluxWithAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) managementCluster := framework.NewClusterE2ETest( t, provider, @@ -832,7 +941,7 @@ func TestTinkerbellKubernetes128UbuntuWorkloadClusterGitFluxWithAPI(t *testing.T ).WithClusterConfig( framework.WithFluxGithubConfig(), api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), ), ) test := framework.NewMulticlusterE2ETest( @@ -846,7 +955,7 @@ func TestTinkerbellKubernetes128UbuntuWorkloadClusterGitFluxWithAPI(t *testing.T framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithManagementCluster(managementCluster.ClusterName), ), ), @@ -905,15 +1014,15 @@ func TestTinkerbellKubernetes128BottlerocketWorkloadClusterWithAPI(t *testing.T) runWorkloadClusterWithAPIFlowForBareMetal(test) } -func TestTinkerbellKubernetes128UbuntuSingleNodeWorkloadCluster(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadCluster(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) test := framework.NewMulticlusterE2ETest( t, framework.NewClusterE2ETest( t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), ), @@ -924,7 +1033,7 @@ func TestTinkerbellKubernetes128UbuntuSingleNodeWorkloadCluster(t *testing.T) { t, provider, framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), ), @@ -933,8 +1042,8 @@ func TestTinkerbellKubernetes128UbuntuSingleNodeWorkloadCluster(t *testing.T) { runTinkerbellWorkloadClusterFlow(test) } -func TestTinkerbellKubernetes128UbuntuSingleNodeWorkloadClusterWithAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellKubernetes129UbuntuSingleNodeWorkloadClusterWithAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) managementCluster := framework.NewClusterE2ETest( t, provider, @@ -942,7 +1051,7 @@ func TestTinkerbellKubernetes128UbuntuSingleNodeWorkloadClusterWithAPI(t *testin framework.WithWorkerHardware(0), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), ), @@ -958,7 +1067,7 @@ func TestTinkerbellKubernetes128UbuntuSingleNodeWorkloadClusterWithAPI(t *testin framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithManagementCluster(managementCluster.ClusterName), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), @@ -968,8 +1077,8 @@ func TestTinkerbellKubernetes128UbuntuSingleNodeWorkloadClusterWithAPI(t *testin runWorkloadClusterWithAPIFlowForBareMetal(test) } -func TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellUpgrade129MulticlusterWorkloadClusterWorkerScaleupGitFluxWithAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) managementCluster := framework.NewClusterE2ETest( t, provider, @@ -980,7 +1089,7 @@ func TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleupGitFluxWith ).WithClusterConfig( framework.WithFluxGithubConfig(), api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.RemoveAllWorkerNodeGroups(), ), ) @@ -995,7 +1104,7 @@ func TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleupGitFluxWith framework.WithClusterName(test.NewWorkloadClusterName()), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithManagementCluster(managementCluster.ClusterName), ), ), @@ -1007,65 +1116,65 @@ func TestTinkerbellUpgrade128MulticlusterWorkloadClusterWorkerScaleupGitFluxWith ) } -func TestTinkerbellUpgrade128MulticlusterWorkloadClusterCPScaleup(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellUpgrade129MulticlusterWorkloadClusterCPScaleup(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(4), framework.WithWorkerHardware(2), ), framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), ), ) runSimpleWorkloadUpgradeFlowForBareMetal( test, - v1alpha1.Kube128, + v1alpha1.Kube129, framework.WithClusterUpgrade( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithControlPlaneCount(3), ), ) } -func TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade127To128(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu127Tinkerbell()) +func TestTinkerbellUpgradeMulticlusterWorkloadClusterK8sUpgrade128To129(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) test := framework.NewMulticlusterE2ETest( t, framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), framework.WithControlPlaneHardware(3), framework.WithWorkerHardware(3), ), framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), ), ) runSimpleWorkloadUpgradeFlowForBareMetal( test, - v1alpha1.Kube128, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), - provider.WithProviderUpgrade(framework.Ubuntu128Image()), + v1alpha1.Kube129, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129)), + provider.WithProviderUpgrade(framework.Ubuntu129Image()), ) } // OIDC -func TestTinkerbellKubernetes128OIDC(t *testing.T) { +func TestTinkerbellKubernetes129OIDC(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), framework.WithOIDC(), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), ) @@ -1073,11 +1182,11 @@ func TestTinkerbellKubernetes128OIDC(t *testing.T) { } // Registry mirror -func TestTinkerbellKubernetes128UbuntuRegistryMirror(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuRegistryMirror(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), framework.WithRegistryMirrorEndpointAndCert(constants.TinkerbellProviderName), @@ -1085,11 +1194,11 @@ func TestTinkerbellKubernetes128UbuntuRegistryMirror(t *testing.T) { runTinkerbellRegistryMirrorFlow(test) } -func TestTinkerbellKubernetes128UbuntuInsecureSkipVerifyRegistryMirror(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuInsecureSkipVerifyRegistryMirror(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), framework.WithRegistryMirrorInsecureSkipVerify(constants.TinkerbellProviderName), @@ -1097,11 +1206,11 @@ func TestTinkerbellKubernetes128UbuntuInsecureSkipVerifyRegistryMirror(t *testin runTinkerbellRegistryMirrorFlow(test) } -func TestTinkerbellKubernetes128UbuntuAuthenticatedRegistryMirror(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuAuthenticatedRegistryMirror(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), framework.WithAuthenticatedRegistryMirror(constants.TinkerbellProviderName), @@ -1154,6 +1263,17 @@ func TestTinkerbellKubernetes128UbuntuSimpleFlow(t *testing.T) { runTinkerbellSimpleFlow(test) } +func TestTinkerbellKubernetes129UbuntuSimpleFlow(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithControlPlaneHardware(1), + framework.WithWorkerHardware(1), + ) + runTinkerbellSimpleFlow(test) +} + func TestTinkerbellKubernetes125Ubuntu2204SimpleFlow(t *testing.T) { provider := framework.NewTinkerbell(t) test := framework.NewClusterE2ETest( @@ -1206,6 +1326,19 @@ func TestTinkerbellKubernetes128Ubuntu2204SimpleFlow(t *testing.T) { runTinkerbellSimpleFlowWithoutClusterConfigGeneration(test) } +func TestTinkerbellKubernetes129Ubuntu2204SimpleFlow(t *testing.T) { + provider := framework.NewTinkerbell(t) + test := framework.NewClusterE2ETest( + t, + provider, + framework.WithControlPlaneHardware(1), + framework.WithWorkerHardware(1), + ).WithClusterConfig( + provider.WithKubeVersionAndOS(v1alpha1.Kube129, framework.Ubuntu2204, nil), + ) + runTinkerbellSimpleFlowWithoutClusterConfigGeneration(test) +} + func TestTinkerbellKubernetes125RedHatSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1250,6 +1383,17 @@ func TestTinkerbellKubernetes128RedHatSimpleFlow(t *testing.T) { runTinkerbellSimpleFlow(test) } +func TestTinkerbellKubernetes129RedHatSimpleFlow(t *testing.T) { + test := framework.NewClusterE2ETest( + t, + framework.NewTinkerbell(t, framework.WithRedHat129Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), + framework.WithControlPlaneHardware(1), + framework.WithWorkerHardware(1), + ) + runTinkerbellSimpleFlow(test) +} + func TestTinkerbellKubernetes128BottleRocketSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, @@ -1261,11 +1405,11 @@ func TestTinkerbellKubernetes128BottleRocketSimpleFlow(t *testing.T) { runTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes128UbuntuThreeControlPlaneReplicasSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuThreeControlPlaneReplicasSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithClusterFiller(api.WithControlPlaneCount(3)), framework.WithControlPlaneHardware(3), @@ -1274,11 +1418,11 @@ func TestTinkerbellKubernetes128UbuntuThreeControlPlaneReplicasSimpleFlow(t *tes runTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes128UbuntuThreeWorkersSimpleFlow(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuThreeWorkersSimpleFlow(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithClusterFiller(api.WithWorkerNodeCount(3)), framework.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithControlPlaneHardware(1), @@ -1287,12 +1431,12 @@ func TestTinkerbellKubernetes128UbuntuThreeWorkersSimpleFlow(t *testing.T) { runTinkerbellSimpleFlow(test) } -func TestTinkerbellKubernetes128UbuntuControlPlaneScaleUp(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellKubernetes129UbuntuControlPlaneScaleUp(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.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithControlPlaneHardware(3), @@ -1300,17 +1444,17 @@ func TestTinkerbellKubernetes128UbuntuControlPlaneScaleUp(t *testing.T) { ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube128, + v1alpha1.Kube129, framework.WithClusterUpgrade(api.WithControlPlaneCount(3)), ) } -func TestTinkerbellKubernetes128UbuntuWorkerNodeScaleUp(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellKubernetes129UbuntuWorkerNodeScaleUp(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.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithControlPlaneHardware(1), @@ -1318,17 +1462,17 @@ func TestTinkerbellKubernetes128UbuntuWorkerNodeScaleUp(t *testing.T) { ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube128, + v1alpha1.Kube129, framework.WithClusterUpgrade(api.WithWorkerNodeCount(2)), ) } -func TestTinkerbellKubernetes128UbuntuWorkerNodeScaleDown(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellKubernetes129UbuntuWorkerNodeScaleDown(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.WithClusterFiller(api.WithControlPlaneCount(1)), framework.WithClusterFiller(api.WithWorkerNodeCount(2)), framework.WithControlPlaneHardware(1), @@ -1336,17 +1480,17 @@ func TestTinkerbellKubernetes128UbuntuWorkerNodeScaleDown(t *testing.T) { ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube128, + v1alpha1.Kube129, framework.WithClusterUpgrade(api.WithWorkerNodeCount(1)), ) } -func TestTinkerbellKubernetes128UbuntuControlPlaneScaleDown(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) +func TestTinkerbellKubernetes129UbuntuControlPlaneScaleDown(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.WithClusterFiller(api.WithControlPlaneCount(3)), framework.WithClusterFiller(api.WithWorkerNodeCount(1)), framework.WithControlPlaneHardware(3), @@ -1354,23 +1498,23 @@ func TestTinkerbellKubernetes128UbuntuControlPlaneScaleDown(t *testing.T) { ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube128, + v1alpha1.Kube129, framework.WithClusterUpgrade(api.WithControlPlaneCount(1)), ) } // Worker nodegroup taints and labels -func TestTinkerbellKubernetes128UbuntuWorkerNodeGroupsTaintsAndLabels(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuWorkerNodeGroupsTaintsAndLabels(t *testing.T) { test := framework.NewClusterE2ETest( t, framework.NewTinkerbell( t, - framework.WithUbuntu128Tinkerbell(), + framework.WithUbuntu129Tinkerbell(), framework.WithCustomTinkerbellMachineConfig(nodeGroupLabel1), framework.WithCustomTinkerbellMachineConfig(nodeGroupLabel2), ), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithControlPlaneLabel(cpKey1, cpVal1), api.WithControlPlaneTaints([]corev1.Taint{framework.NoScheduleTaint()}), api.RemoveAllWorkerNodeGroups(), // This gives us a blank slate @@ -1393,23 +1537,23 @@ func TestTinkerbellKubernetes128UbuntuWorkerNodeGroupsTaintsAndLabels(t *testing // Proxy tests -func TestTinkerbellAirgappedKubernetes128UbuntuProxyConfigFlow(t *testing.T) { +func TestTinkerbellAirgappedKubernetes129UbuntuProxyConfigFlow(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.Kube128), ".", "-", 1) + kubeVersion := strings.Replace(string(v1alpha1.Kube129), ".", "-", 1) test := framework.NewClusterE2ETest( t, framework.NewTinkerbell(t, - framework.WithUbuntu128Tinkerbell(), + framework.WithUbuntu129Tinkerbell(), framework.WithHookImagesURLPath("http://"+localIp.String()+":8080"), ), framework.WithClusterFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), ), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), @@ -1420,11 +1564,11 @@ func TestTinkerbellAirgappedKubernetes128UbuntuProxyConfigFlow(t *testing.T) { } // OOB test -func TestTinkerbellKubernetes128UbuntuOOB(t *testing.T) { +func TestTinkerbellKubernetes129UbuntuOOB(t *testing.T) { test := framework.NewClusterE2ETest( t, - framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()), - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), + framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube129)), framework.WithOOBConfiguration(), framework.WithControlPlaneHardware(1), framework.WithWorkerHardware(1), @@ -1432,26 +1576,26 @@ func TestTinkerbellKubernetes128UbuntuOOB(t *testing.T) { runTinkerbellSimpleFlow(test) } -func TestTinkerbellK8sUpgrade127to128WithUbuntuOOB(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu127Tinkerbell()) +func TestTinkerbellK8sUpgrade128to129WithUbuntuOOB(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) test := framework.NewClusterE2ETest( t, provider, - framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube127)), + framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)), framework.WithOOBConfiguration(), framework.WithControlPlaneHardware(2), framework.WithWorkerHardware(2), ) runSimpleUpgradeFlowForBareMetal( test, - v1alpha1.Kube128, - framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube128)), - provider.WithProviderUpgrade(framework.Ubuntu128Image()), + v1alpha1.Kube129, + framework.WithClusterUpgrade(api.WithKubernetesVersion(v1alpha1.Kube129)), + provider.WithProviderUpgrade(framework.Ubuntu129Image()), ) } -func TestTinkerbellSingleNode127To128UbuntuManagementCPUpgradeAPI(t *testing.T) { - provider := framework.NewTinkerbell(t, framework.WithUbuntu127Tinkerbell()) +func TestTinkerbellSingleNode128To129UbuntuManagementCPUpgradeAPI(t *testing.T) { + provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) managementCluster := framework.NewClusterE2ETest( t, provider, @@ -1459,7 +1603,7 @@ func TestTinkerbellSingleNode127To128UbuntuManagementCPUpgradeAPI(t *testing.T) framework.WithWorkerHardware(2), ).WithClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube127), + api.WithKubernetesVersion(v1alpha1.Kube128), api.WithControlPlaneCount(1), api.WithEtcdCountIfExternal(0), api.RemoveAllWorkerNodeGroups(), @@ -1472,16 +1616,16 @@ func TestTinkerbellSingleNode127To128UbuntuManagementCPUpgradeAPI(t *testing.T) runWorkloadClusterUpgradeFlowWithAPIForBareMetal( test, api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithControlPlaneCount(3), ), - provider.WithKubeVersionAndOS(v1alpha1.Kube128, framework.Ubuntu2004, nil), + provider.WithKubeVersionAndOS(v1alpha1.Kube129, framework.Ubuntu2004, nil), ) } -func TestTinkerbellKubernetes128UpgradeManagementComponents(t *testing.T) { +func TestTinkerbellKubernetes129UpgradeManagementComponents(t *testing.T) { release := latestMinorRelease(t) - provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) + provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) test := framework.NewClusterE2ETest( t, provider, @@ -1492,11 +1636,11 @@ func TestTinkerbellKubernetes128UpgradeManagementComponents(t *testing.T) { test.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release)) test.UpdateClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube128), + api.WithKubernetesVersion(v1alpha1.Kube129), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), ), - provider.WithKubeVersionAndOS(v1alpha1.Kube128, framework.Ubuntu2004, nil), + provider.WithKubeVersionAndOS(v1alpha1.Kube129, framework.Ubuntu2004, nil), ) test.GenerateHardwareConfig(framework.ExecuteWithEksaRelease(release)) diff --git a/test/framework/tinkerbell.go b/test/framework/tinkerbell.go index 4fe53ee95bd9..dbb50154b1aa 100644 --- a/test/framework/tinkerbell.go +++ b/test/framework/tinkerbell.go @@ -21,16 +21,19 @@ const ( 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" 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" 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" tinkerbellInventoryCsvFilePathEnvVar = "T_TINKERBELL_INVENTORY_CSV" tinkerbellSSHAuthorizedKey = "T_TINKERBELL_SSH_AUTHORIZED_KEY" TinkerbellCIEnvironment = "T_TINKERBELL_CI_ENVIRONMENT" @@ -45,16 +48,19 @@ var requiredTinkerbellEnvVars = []string{ tinkerbellImageUbuntu126EnvVar, tinkerbellImageUbuntu127EnvVar, tinkerbellImageUbuntu128EnvVar, + tinkerbellImageUbuntu129EnvVar, tinkerbellImageUbuntu2204Kubernetes124EnvVar, tinkerbellImageUbuntu2204Kubernetes125EnvVar, tinkerbellImageUbuntu2204Kubernetes126EnvVar, tinkerbellImageUbuntu2204Kubernetes127EnvVar, tinkerbellImageUbuntu2204Kubernetes128EnvVar, + tinkerbellImageUbuntu2204Kubernetes129EnvVar, tinkerbellImageRedHat124EnvVar, tinkerbellImageRedHat125EnvVar, tinkerbellImageRedHat126EnvVar, tinkerbellImageRedHat127EnvVar, tinkerbellImageRedHat128EnvVar, + tinkerbellImageRedHat129EnvVar, tinkerbellInventoryCsvFilePathEnvVar, tinkerbellSSHAuthorizedKey, } @@ -226,6 +232,11 @@ func WithUbuntu128Tinkerbell() TinkerbellOpt { return withKubeVersionAndOS(anywherev1.Kube128, Ubuntu2004, "", nil) } +// WithUbuntu129Tinkerbell tink test with ubuntu 1.29. +func WithUbuntu129Tinkerbell() TinkerbellOpt { + return withKubeVersionAndOS(anywherev1.Kube129, Ubuntu2004, "", nil) +} + // WithRedHat125Tinkerbell tink test with redhat 1.25. func WithRedHat125Tinkerbell() TinkerbellOpt { return withKubeVersionAndOS(anywherev1.Kube125, RedHat8, "", nil) @@ -241,11 +252,16 @@ func WithRedHat127Tinkerbell() TinkerbellOpt { return withKubeVersionAndOS(anywherev1.Kube127, RedHat8, "", nil) } -// WithRedHat128Tinkerbell tink test with redhat 1.27. +// WithRedHat128Tinkerbell tink test with redhat 1.28. func WithRedHat128Tinkerbell() TinkerbellOpt { return withKubeVersionAndOS(anywherev1.Kube128, RedHat8, "", nil) } +// WithRedHat129Tinkerbell tink test with redhat 1.29. +func WithRedHat129Tinkerbell() TinkerbellOpt { + return withKubeVersionAndOS(anywherev1.Kube129, RedHat8, "", nil) +} + func WithBottleRocketTinkerbell() TinkerbellOpt { return func(t *Tinkerbell) { t.fillers = append(t.fillers, @@ -323,6 +339,11 @@ func Ubuntu128Image() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube128, Ubuntu2004, "") } +// Ubuntu129Image represents an Ubuntu raw image corresponding to Kubernetes 1.29. +func Ubuntu129Image() api.TinkerbellFiller { + return imageForKubeVersionAndOS(anywherev1.Kube129, 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) @@ -338,6 +359,11 @@ func Ubuntu128ImageForCP() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube128, Ubuntu2004, controlPlaneIdentifier) } +// Ubuntu129ImageForCP represents an Ubuntu raw image corresponding to Kubernetes 1.29 and is set for CP machine config. +func Ubuntu129ImageForCP() api.TinkerbellFiller { + return imageForKubeVersionAndOS(anywherev1.Kube129, 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) @@ -367,3 +393,8 @@ func Ubuntu2204Kubernetes127Image() api.TinkerbellFiller { func Ubuntu2204Kubernetes128Image() api.TinkerbellFiller { return imageForKubeVersionAndOS(anywherev1.Kube128, Ubuntu2204, "") } + +// Ubuntu2204Kubernetes129Image represents an Ubuntu 22.04 raw image corresponding to Kubernetes 1.29. +func Ubuntu2204Kubernetes129Image() api.TinkerbellFiller { + return imageForKubeVersionAndOS(anywherev1.Kube129, Ubuntu2204, "") +}