Merge pull request #4431 from k8s-infra-cherrypick-robot/cherry-pick-4416-to-release-1.11

k8s-ci-robot · web-flow · commit 9dda27608c8a · 2024-01-04T19:26:26.000+01:00
[release-1.11] Revert "Temporarily pin Flatcar version to v1.26.10"
diff --git a/test/e2e/config/azure-dev.yaml b/test/e2e/config/azure-dev.yaml
@@ -148,7 +148,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
@@ -752,7 +752,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)

Original file line number	Diff line number	Diff line change
`@@ -752,7 +752,7 @@ func resolveFlatcarVersion(config *clusterctl.E2EConfig, versions semver.Version`
`752`	`752`
`753`	`753`	`if version == "latest" {`
`754`	`754`	`semver.Sort(versions)`
`755`		`- version = versions[0].String()`
	`755`	`+ version = versions[len(versions)-1].String()`
`756`	`756`	`}`
`757`	`757`
`758`	`758`	`resolveVariable(config, varName, version)`