From 96f3cfb989884a3ad6083ba6ebfb9c0a93a8354c Mon Sep 17 00:00:00 2001 From: Alexandr Demicev Date: Thu, 22 Aug 2024 16:20:43 +0200 Subject: [PATCH] Fix expected version in cluster upgrade check Signed-off-by: Alexandr Demicev --- test/e2e/config/e2e_conf.yaml | 2 +- test/e2e/helpers.go | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/test/e2e/config/e2e_conf.yaml b/test/e2e/config/e2e_conf.yaml index d19cdfec..63f625e3 100644 --- a/test/e2e/config/e2e_conf.yaml +++ b/test/e2e/config/e2e_conf.yaml @@ -132,7 +132,7 @@ variables: NODE_DRAIN_TIMEOUT: "60s" CONFORMANCE_WORKER_MACHINE_COUNT: "2" CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1" - KUBERNETES_VERSION_UPGRADE_TO: "v1.28.2" + KUBERNETES_VERSION_UPGRADE_TO: "v1.28.12" KUBERNETES_UPGRADE_OCI_IMAGE_ID: "${KUBERNETES_UPGRADE_OCI_IMAGE_ID}" IP_FAMILY: "IPv4" EXP_CLUSTER_RESOURCE_SET: "true" diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go index 03b62d9f..76a02908 100644 --- a/test/e2e/helpers.go +++ b/test/e2e/helpers.go @@ -33,7 +33,6 @@ import ( "k8s.io/klog/v2" controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1" - bsutil "github.com/rancher/cluster-api-provider-rke2/pkg/util" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/test/framework" "sigs.k8s.io/cluster-api/test/framework/clusterctl" @@ -319,11 +318,7 @@ func WaitForClusterToUpgrade(ctx context.Context, input WaitForClusterToUpgradeI } for _, machine := range machineList.Items { - expectedVersion := input.VersionAfterUpgrade - if bsutil.IsRKE2Version(*machine.Spec.Version) { - expectedVersion = input.VersionAfterUpgrade + "+rke2r1" - } - + expectedVersion := input.VersionAfterUpgrade + "+rke2r1" if machine.Spec.Version != nil && *machine.Spec.Version != expectedVersion { return false, nil }