From e07a5d966f1ac04d580b6179973837cd8510a3b5 Mon Sep 17 00:00:00 2001 From: Cavaughn Browne <113555337+cxbrowne1207@users.noreply.github.com> Date: Fri, 16 Feb 2024 11:32:20 -0600 Subject: [PATCH] revert tinkberll upgrade management components to use kube 1.28 (#7617) --- test/e2e/TINKERBELL_HARDWARE_COUNT.yaml | 2 +- test/e2e/tinkerbell_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml b/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml index 9fbfd7a86cec..becadeead99e 100644 --- a/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml +++ b/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml @@ -126,4 +126,4 @@ TestTinkerbellKubernetes125UbuntuTo126SingleNodeInPlaceUpgrade: 1 TestTinkerbellKubernetes126UbuntuTo127SingleNodeInPlaceUpgrade: 1 TestTinkerbellKubernetes127UbuntuTo128SingleNodeInPlaceUpgrade: 1 TestTinkerbellKubernetes128UbuntuTo129SingleNodeInPlaceUpgrade: 1 -TestTinkerbellKubernetes129UpgradeManagementComponents: 2 \ No newline at end of file +TestTinkerbellKubernetes128UpgradeManagementComponents: 2 \ No newline at end of file diff --git a/test/e2e/tinkerbell_test.go b/test/e2e/tinkerbell_test.go index e0fc39f6c21a..443dd7fef58e 100644 --- a/test/e2e/tinkerbell_test.go +++ b/test/e2e/tinkerbell_test.go @@ -1623,9 +1623,9 @@ func TestTinkerbellSingleNode128To129UbuntuManagementCPUpgradeAPI(t *testing.T) ) } -func TestTinkerbellKubernetes129UpgradeManagementComponents(t *testing.T) { +func TestTinkerbellKubernetes128UpgradeManagementComponents(t *testing.T) { release := latestMinorRelease(t) - provider := framework.NewTinkerbell(t, framework.WithUbuntu129Tinkerbell()) + provider := framework.NewTinkerbell(t, framework.WithUbuntu128Tinkerbell()) test := framework.NewClusterE2ETest( t, provider, @@ -1636,11 +1636,11 @@ func TestTinkerbellKubernetes129UpgradeManagementComponents(t *testing.T) { test.GenerateClusterConfigForVersion(release.Version, framework.ExecuteWithEksaRelease(release)) test.UpdateClusterConfig( api.ClusterToConfigFiller( - api.WithKubernetesVersion(v1alpha1.Kube129), + api.WithKubernetesVersion(v1alpha1.Kube128), api.WithControlPlaneCount(1), api.WithWorkerNodeCount(1), ), - provider.WithKubeVersionAndOS(v1alpha1.Kube129, framework.Ubuntu2004, nil), + provider.WithKubeVersionAndOS(v1alpha1.Kube128, framework.Ubuntu2004, nil), ) test.GenerateHardwareConfig(framework.ExecuteWithEksaRelease(release))