From 52cd12951c567d76c9dfa3ca11ba53d16cdbc5d3 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 30 Jun 2022 20:14:34 +0400 Subject: [PATCH] test: bump Talos versions in upgrade tests We should keep the latest stable up to date. Signed-off-by: Andrey Smirnov --- Makefile | 2 +- internal/integration/provision/upgrade.go | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7e248c502..4a8b56e40 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,7 @@ KUBESTR_URL ?= https://github.com/kastenhq/kubestr/releases/download/v0.4.31/kub CLUSTERCTL_VERSION ?= 1.1.3 CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64 TESTPKGS ?= github.com/talos-systems/talos/... -RELEASES ?= v0.14.3 v1.0.0 +RELEASES ?= v1.0.6 v1.1.0 SHORT_INTEGRATION_TEST ?= CUSTOM_CNI_URL ?= INSTALLER_ARCH ?= all diff --git a/internal/integration/provision/upgrade.go b/internal/integration/provision/upgrade.go index 81711bb93..083cd01a0 100644 --- a/internal/integration/provision/upgrade.go +++ b/internal/integration/provision/upgrade.go @@ -72,12 +72,12 @@ type upgradeSpec struct { } const ( - previousRelease = "v0.14.3" - stableRelease = "v1.0.0" // or soon-to-be-stable + previousRelease = "v1.0.6" + stableRelease = "v1.1.0" // or soon-to-be-stable // The current version (the one being built on CI) is DefaultSettings.CurrentVersion. - previousK8sVersion = "1.23.1" // constants.DefaultKubernetesVersion in the previousRelease - stableK8sVersion = "1.23.5" // constants.DefaultKubernetesVersion in the stableRelease + previousK8sVersion = "1.23.6" // constants.DefaultKubernetesVersion in the previousRelease + stableK8sVersion = "1.24.2" // constants.DefaultKubernetesVersion in the stableRelease currentK8sVersion = constants.DefaultKubernetesVersion ) @@ -103,9 +103,6 @@ func upgradePreviousToStable() upgradeSpec { TargetVersion: stableRelease, TargetK8sVersion: stableK8sVersion, - // TODO: remove when StableVersion >= 0.14.0-beta.0 - SkipKubeletUpgrade: true, - MasterNodes: DefaultSettings.MasterNodes, WorkerNodes: DefaultSettings.WorkerNodes, }