Merge pull request rancher#45441 from chiukapoor/docker26-in-29

[release/v2.9] Add docker 26.0 support and set it as default
anupama2501 · May 21, 2024 · 3c48a19 · 3c48a19
2 parents 989139e + 9d4e130
commit 3c48a19
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 13 deletions.
diff --git a/go.mod b/go.mod
@@ -133,7 +133,7 @@ require (
 	github.com/rancher/norman v0.0.0-20240207153100-3bb70b772b52
 	github.com/rancher/rancher/pkg/client v0.0.0
 	github.com/rancher/remotedialer v0.3.0
-	github.com/rancher/rke v1.6.0-rc1
+	github.com/rancher/rke v1.6.0-rc3
 	github.com/rancher/steve v0.0.0-20240314145706-870824dc8f49
 	github.com/rancher/system-upgrade-controller/pkg/apis v0.0.0-20210727200656-10b094e30007
 	github.com/rancher/wrangler/v2 v2.1.4

diff --git a/go.sum b/go.sum
@@ -1698,8 +1698,8 @@ github.com/rancher/qase-go/client v0.0.0-20240308221502-c3b2635212be h1:+m6Jv5sA
 github.com/rancher/qase-go/client v0.0.0-20240308221502-c3b2635212be/go.mod h1:NP3xboG+t2p+XMnrcrJ/L384Ki0Cp3Pww/X+vm5Jcy0=
 github.com/rancher/remotedialer v0.3.0 h1:y1EO8JCsgZo0RcqTUp6U8FXcBAv27R+TLnWRcpvX1sM=
 github.com/rancher/remotedialer v0.3.0/go.mod h1:BwwztuvViX2JrLLUwDlsYt5DiyUwHLlzynRwkZLAY0Q=
-github.com/rancher/rke v1.6.0-rc1 h1:4aYfGiG4gxL5k44M3jpDoKfQqI1lxdl4GAVPRMvKMj8=
-github.com/rancher/rke v1.6.0-rc1/go.mod h1:vojhOf8U8VCmw7y17OENWXSIfEFPEbXCMQcmI7xN7i8=
+github.com/rancher/rke v1.6.0-rc3 h1:AT4oRN8qyoampqhQ7zWZLPsXAoOXUsECC9Oh7gjWFFY=
+github.com/rancher/rke v1.6.0-rc3/go.mod h1:/z9oyKqYpFwgRBV9rfLxqUdjydz/VMCTcjld4uUt7uM=
 github.com/rancher/shepherd v0.0.0-20240513202553-b237456b1927 h1:4riXwztwQme5CiRcMqAuwDrhkTDeekIeXe1+c+I1SFo=
 github.com/rancher/shepherd v0.0.0-20240513202553-b237456b1927/go.mod h1:Mpd+RsxaqTMaoKSdeiEvGoDEknAKS8hAWjdozi5mJxE=
 github.com/rancher/steve v0.0.0-20240314145706-870824dc8f49 h1:FVWzTCgR2bRcKIWqgJCa7L4s8J1S8HfCJMnqoSj99yg=

diff --git a/pkg/apis/go.mod b/pkg/apis/go.mod
@@ -33,7 +33,7 @@ require (
 	github.com/rancher/fleet/pkg/apis v0.0.0-20231017140638-93432f288e79
 	github.com/rancher/gke-operator v1.3.0-rc6
 	github.com/rancher/norman v0.0.0-20240207153100-3bb70b772b52
-	github.com/rancher/rke v1.6.0-rc1
+	github.com/rancher/rke v1.6.0-rc3
 	github.com/rancher/wrangler/v2 v2.1.4
 	github.com/sirupsen/logrus v1.9.3
 	k8s.io/api v0.28.8

diff --git a/pkg/apis/go.sum b/pkg/apis/go.sum
@@ -116,8 +116,8 @@ github.com/rancher/lasso v0.0.0-20240123150939-7055397d6dfa h1:eRhvQJjIpPxJunlS3
 github.com/rancher/lasso v0.0.0-20240123150939-7055397d6dfa/go.mod h1:utdskbIL7kdVvPCUFPEJQDWJwPHGFpUCRfVkX2G2Xxg=
 github.com/rancher/norman v0.0.0-20240207153100-3bb70b772b52 h1:k9QmFfME7e92jP7X5iTtPHoOrM9Z/zXZQpAh5jzk6dE=
 github.com/rancher/norman v0.0.0-20240207153100-3bb70b772b52/go.mod h1:WbNpu/HwChwKk54W0rWBdioxYVVZwVVz//UX84m/NvY=
-github.com/rancher/rke v1.6.0-rc1 h1:4aYfGiG4gxL5k44M3jpDoKfQqI1lxdl4GAVPRMvKMj8=
-github.com/rancher/rke v1.6.0-rc1/go.mod h1:vojhOf8U8VCmw7y17OENWXSIfEFPEbXCMQcmI7xN7i8=
+github.com/rancher/rke v1.6.0-rc3 h1:AT4oRN8qyoampqhQ7zWZLPsXAoOXUsECC9Oh7gjWFFY=
+github.com/rancher/rke v1.6.0-rc3/go.mod h1:/z9oyKqYpFwgRBV9rfLxqUdjydz/VMCTcjld4uUt7uM=
 github.com/rancher/wrangler v1.1.1 h1:wmqUwqc2M7ADfXnBCJTFkTB5ZREWpD78rnZMzmxwMvM=
 github.com/rancher/wrangler v1.1.1/go.mod h1:ioVbKupzcBOdzsl55MvEDN0R1wdGggj8iNCYGFI5JvM=
 github.com/rancher/wrangler/v2 v2.1.4 h1:ohov0i6A9dJHHO6sjfsH4Dqv93ZTdm5lIJVJdPzVdQc=

diff --git a/pkg/controllers/management/node/controller.go b/pkg/controllers/management/node/controller.go
@@ -45,7 +45,7 @@ import (
 )
 
 const (
-	defaultEngineInstallURL         = "https://releases.rancher.com/install-docker/25.0.sh"
+	defaultEngineInstallURL         = "https://releases.rancher.com/install-docker/26.0.sh"
 	amazonec2                       = "amazonec2"
 	userNodeRemoveCleanupAnnotation = "cleanup.cattle.io/user-node-remove"
 	userNodeRemoveFinalizerPrefix   = "clusterscoped.controller.cattle.io/user-node-remove_"

diff --git a/pkg/settings/setting.go b/pkg/settings/setting.go
@@ -63,10 +63,10 @@ var (
 	CLIURLLinux                         = NewSetting("cli-url-linux", "https://releases.rancher.com/cli/v1.0.0-alpha8/rancher-linux-amd64-v1.0.0-alpha8.tar.gz")
 	CLIURLWindows                       = NewSetting("cli-url-windows", "https://releases.rancher.com/cli/v1.0.0-alpha8/rancher-windows-386-v1.0.0-alpha8.zip")
 	ClusterControllerStartCount         = NewSetting("cluster-controller-start-count", "50")
-	EngineInstallURL                    = NewSetting("engine-install-url", "https://releases.rancher.com/install-docker/25.0.sh")
+	EngineInstallURL                    = NewSetting("engine-install-url", "https://releases.rancher.com/install-docker/26.0.sh")
 	EngineISOURL                        = NewSetting("engine-iso-url", "https://releases.rancher.com/os/latest/rancheros-vmware.iso")
 	EngineNewestVersion                 = NewSetting("engine-newest-version", "v17.12.0")
-	EngineSupportedRange                = NewSetting("engine-supported-range", "~v1.11.2 || ~v1.12.0 || ~v1.13.0 || ~v17.03.0 || ~v17.06.0 || ~v17.09.0 || ~v18.06.0 || ~v18.09.0 || ~v19.03.0 || ~v20.10.0 || ~v23.0.0 || ~v24.0.0 || ~v25.0.0 ")
+	EngineSupportedRange                = NewSetting("engine-supported-range", "~v1.11.2 || ~v1.12.0 || ~v1.13.0 || ~v17.03.0 || ~v17.06.0 || ~v17.09.0 || ~v18.06.0 || ~v18.09.0 || ~v19.03.0 || ~v20.10.0 || ~v23.0.0 || ~v24.0.0 || ~v25.0.0 || ~v26.0.0")
 	FirstLogin                          = NewSetting("first-login", "true")
 	GlobalRegistryEnabled               = NewSetting("global-registry-enabled", "false")
 	GithubProxyAPIURL                   = NewSetting("github-proxy-api-url", "https://api.github.com")

diff --git a/tests/validation/lib/cloud_provider.py b/tests/validation/lib/cloud_provider.py
@@ -4,7 +4,7 @@
 
 
 class CloudProviderBase(object, metaclass=abc.ABCMeta):
-    DOCKER_VERSION = os.environ.get("DOCKER_VERSION", '25.0')
+    DOCKER_VERSION = os.environ.get("DOCKER_VERSION", '26.0')
     DOCKER_INSTALLED = os.environ.get("DOCKER_INSTALLED", "false")
 
     @abc.abstractmethod

diff --git a/tests/validation/tests/v3_api/test_node_label.py b/tests/validation/tests/v3_api/test_node_label.py
@@ -40,7 +40,7 @@
 cluster_node_template_2 = {"cluster": [], "node_template": []}
 roles = [CLUSTER_MEMBER, CLUSTER_OWNER, PROJECT_OWNER, PROJECT_MEMBER,
          PROJECT_READ_ONLY]
-engine_install_url = "https://releases.rancher.com/install-docker/25.0.sh"
+engine_install_url = "https://releases.rancher.com/install-docker/26.0.sh"
 
 
 def test_node_label_add():

diff --git a/tests/validation/tests/v3_api/test_node_template.py b/tests/validation/tests/v3_api/test_node_template.py
@@ -6,7 +6,7 @@
 from .test_rke_cluster_provisioning import random_node_name
 from .test_rke_cluster_provisioning import create_and_validate_cluster
 
-engine_install_url = "https://releases.rancher.com/install-docker/25.0.sh"
+engine_install_url = "https://releases.rancher.com/install-docker/26.0.sh"
 user_clients = {"admin": None, "standard_user_1": None,
                 "standard_user_2": None}
 

diff --git a/tests/validation/tests/v3_api/test_rke_cluster_provisioning.py b/tests/validation/tests/v3_api/test_rke_cluster_provisioning.py
@@ -15,7 +15,7 @@
 AZURE_TENANT_ID = os.environ.get("AZURE_TENANT_ID")
 worker_count = int(os.environ.get('RANCHER_STRESS_TEST_WORKER_COUNT', 1))
 HOST_NAME = os.environ.get('RANCHER_HOST_NAME', "testcustom")
-engine_install_url = "https://releases.rancher.com/install-docker/25.0.sh"
+engine_install_url = "https://releases.rancher.com/install-docker/26.0.sh"
 
 rke_config = {
     "addonJobTimeout": 30,