Merge pull request #4430 from k8s-infra-cherrypick-robot/cherry-pick-…

…4416-to-release-1.12 [release-1.12] Revert "Temporarily pin Flatcar version to v1.26.10"
kubernetes-sigs · Jan 4, 2024 · b5f0342 · b5f0342
2 parents 2abe923 + 97720be
commit b5f0342
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml
@@ -170,7 +170,7 @@ variables:
   AKS_KUBERNETES_VERSION: "latest"
   AKS_KUBERNETES_VERSION_UPGRADE_FROM: "latest-1"
   KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.26.6}" # temporarily pin to v1.26.6 to workaround Calico dual stack issues
-  FLATCAR_KUBERNETES_VERSION: "${FLATCAR_KUBERNETES_VERSION:-v1.26.10}" # temporarily pin to v1.26.10 to workaround Flatcar image issues
+  FLATCAR_KUBERNETES_VERSION: "${FLATCAR_KUBERNETES_VERSION:-stable-1.26}"
   FLATCAR_VERSION: "${FLATCAR_VERSION:-latest}"
   ETCD_VERSION_UPGRADE_TO: "3.5.4-0"
   COREDNS_VERSION_UPGRADE_TO: "v1.9.3"

diff --git a/test/e2e/helpers.go b/test/e2e/helpers.go
@@ -751,7 +751,7 @@ func resolveFlatcarVersion(config *clusterctl.E2EConfig, versions semver.Version
 
 	if version == "latest" {
 		semver.Sort(versions)
-		version = versions[0].String()
+		version = versions[len(versions)-1].String()
 	}
 
 	resolveVariable(config, varName, version)