Merge pull request rancher#47289 from krunalhinguu/add-docker-v27.2

[v2.9] Add default docker version to v27.2
HarrisonWAffel · Oct 1, 2024 · da8f83b · da8f83b
2 parents 88c1d78 + 599a18f
commit da8f83b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/pkg/settings/setting.go b/pkg/settings/setting.go
@@ -70,10 +70,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/27.1.sh")
+	EngineInstallURL                    = NewSetting("engine-install-url", "https://releases.rancher.com/install-docker/27.2.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 || ~v26.0.0 || ~v26.1.0 || ~v27.0.0 || ~v27.1.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 || ~v26.1.0 || ~v27.0.0 || ~v27.1.0 || ~v27.2.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", '27.1')
+    DOCKER_VERSION = os.environ.get("DOCKER_VERSION", '27.2')
     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/27.1.sh"
+engine_install_url = "https://releases.rancher.com/install-docker/27.2.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/27.1.sh"
+engine_install_url = "https://releases.rancher.com/install-docker/27.2.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/27.1.sh"
+engine_install_url = "https://releases.rancher.com/install-docker/27.2.sh"
 
 rke_config = {
     "addonJobTimeout": 30,