make docker 24.0 default

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
kubernetes-sigs · Feb 4, 2024 · db34dcf · db34dcf
1 parent 0dbde75
commit db34dcf
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 96 deletions.
diff --git a/README.md b/README.md
@@ -162,7 +162,7 @@ Note: Upstart/SysV init based OS types are not supported.
 - Core
   - [kubernetes](https://github.com/kubernetes/kubernetes) v1.29.1
   - [etcd](https://github.com/etcd-io/etcd) v3.5.10
-  - [docker](https://www.docker.com/) v20.10 (see note)
+  - [docker](https://www.docker.com/) v24.0 (see [Note](#container-runtime-notes))
   - [containerd](https://containerd.io/) v1.7.13
   - [cri-o](http://cri-o.io/) v1.29.1 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
 - Network Plugin
@@ -196,7 +196,7 @@ Note: Upstart/SysV init based OS types are not supported.
 
 ## Container Runtime Notes
 
-- Supported Docker versions are 18.09, 19.03, 20.10, 23.0 and 24.0. The *recommended* Docker version is 20.10 (except on Debian bookworm which without supporting for 20.10 and below any more). `Kubelet` might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. the YUM  ``versionlock`` plugin or ``apt pin``).
+- Supported Docker versions are 18.09, 19.03, 20.10, 23.0 and 24.0. The *recommended* Docker version is 24.0. `Kubelet` might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. the YUM  ``versionlock`` plugin or ``apt pin``).
 - The cri-o version should be aligned with the respective kubernetes version (i.e. kube_version=1.20.x, crio_version=1.20)
 
 ## Requirements

diff --git a/roles/container-engine/docker/defaults/main.yml b/roles/container-engine/docker/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-docker_version: '20.10'
+docker_version: '24.0'
 docker_cli_version: "{{ docker_version }}"
 
 docker_package_info:

diff --git a/roles/container-engine/docker/vars/debian-bookworm.yml b/roles/container-engine/docker/vars/debian-bookworm.yml
diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml
@@ -22,25 +22,30 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}=1.6.15-1"
   '1.6.16': "{{ containerd_package }}=1.6.16-1"
   '1.6.18': "{{ containerd_package }}=1.6.18-1"
-  'stable': "{{ containerd_package }}=1.6.18-1"
-  'edge': "{{ containerd_package }}=1.6.18-1"
+  '1.6.28': "{{ containerd_package }}=1.6.28-1"
+  'stable': "{{ containerd_package }}=1.6.28-1"
+  'edge': "{{ containerd_package }}=1.6.28-1"
 
 # https://download.docker.com/linux/debian/
 docker_versioned_pkg:
   'latest': docker-ce
   '18.09': docker-ce=5:18.09.9~3-0~debian-{{ ansible_distribution_release | lower }}
   '19.03': docker-ce=5:19.03.15~3-0~debian-{{ ansible_distribution_release | lower }}
   '20.10': docker-ce=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
-  'stable': docker-ce=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
-  'edge': docker-ce=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
+  '23.0': docker-ce=5:23.0.6-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  '24.0': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  'stable': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  'edge': docker-ce=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli=5:18.09.9~3-0~debian-{{ ansible_distribution_release | lower }}
   '19.03': docker-ce-cli=5:19.03.15~3-0~debian-{{ ansible_distribution_release | lower }}
   '20.10': docker-ce-cli=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
-  'stable': docker-ce-cli=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
-  'edge': docker-ce-cli=5:20.10.20~3-0~debian-{{ ansible_distribution_release | lower }}
+  '23.0': docker-ce-cli=5:23.0.6-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  '24.0': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  'stable': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
+  'edge': docker-ce-cli=5:24.0.9-1~debian.{{ ansible_distribution_major_version }}~{{ ansible_distribution_release | lower }}
 
 docker_package_info:
   pkgs:

diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml
@@ -22,24 +22,29 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}-1.6.15-3.1.fc{{ ansible_distribution_major_version }}"
   '1.6.16': "{{ containerd_package }}-1.6.16-3.1.fc{{ ansible_distribution_major_version }}"
   '1.6.18': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}"
-  'stable': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}"
-  'edge': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}"
+  '1.6.28': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}"
+  'stable': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}"
+  'edge': "{{ containerd_package }}-1.6.28-3.1.fc{{ ansible_distribution_major_version }}"
 
 # https://docs.docker.com/install/linux/docker-ce/fedora/
 # https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/
 docker_versioned_pkg:
   'latest': docker-ce
   '19.03': docker-ce-19.03.15-3.fc{{ ansible_distribution_major_version }}
   '20.10': docker-ce-20.10.20-3.fc{{ ansible_distribution_major_version }}
-  'stable': docker-ce-20.10.20-3.fc{{ ansible_distribution_major_version }}
-  'edge': docker-ce-20.10.20-3.fc{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-3:23.0.6-1.fc{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }}
+  'stable': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }}
+  'edge': docker-ce-3:24.0.9-1.fc{{ ansible_distribution_major_version }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '19.03': docker-ce-cli-19.03.15-3.fc{{ ansible_distribution_major_version }}
   '20.10': docker-ce-cli-20.10.20-3.fc{{ ansible_distribution_major_version }}
-  'stable': docker-ce-cli-20.10.20-3.fc{{ ansible_distribution_major_version }}
-  'edge': docker-ce-cli-20.10.20-3.fc{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-cli-1:23.0.6-1.fc{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }}
+  'stable': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }}
+  'edge': docker-ce-cli-1:24.0.9-1.fc{{ ansible_distribution_major_version }}
 
 docker_package_info:
   enablerepo: "docker-ce"

diff --git a/roles/container-engine/docker/vars/kylin.yml b/roles/container-engine/docker/vars/kylin.yml
@@ -22,8 +22,9 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}-1.6.15-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'stable': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'edge': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
+  '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'stable': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'edge': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
 
 docker_version: 19.03
 docker_cli_version: 19.03
@@ -33,17 +34,21 @@ docker_cli_version: 19.03
 # or do 'yum --showduplicates list docker-engine'
 docker_versioned_pkg:
   'latest': docker-ce
-  '18.09': docker-ce-3:18.09.9-3.el7
+  '18.09': docker-ce-3:18.09.9-3.el{{ ansible_distribution_major_version }}
   '19.03': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-3:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
-  '18.09': docker-ce-cli-1:18.09.9-3.el7
+  '18.09': docker-ce-cli-1:18.09.9-3.el{{ ansible_distribution_major_version }}
   '19.03': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-cli-1:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_package_info:
   enablerepo: "docker-ce"

diff --git a/roles/container-engine/docker/vars/redhat-7.yml b/roles/container-engine/docker/vars/redhat-7.yml
@@ -22,7 +22,8 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}-1.6.15-3.1.el7"
   '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el7"
   '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el7"
-  'stable': "{{ containerd_package }}-1.6.18-3.1.el7"
+  '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el7"
+  'stable': "{{ containerd_package }}-1.6.28-3.1.el7"
   'edge': "{{ containerd_package }}-1.6.18-3.1.el7"
 
 # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
@@ -33,16 +34,20 @@ docker_versioned_pkg:
   '18.09': docker-ce-18.09.9-3.el7
   '19.03': docker-ce-19.03.15-3.el7
   '20.10': docker-ce-20.10.20-3.el7
-  'stable': docker-ce-20.10.20-3.el7
-  'edge': docker-ce-20.10.20-3.el7
+  '23.0': docker-ce-23.0.6-1.el7
+  '24.0': docker-ce-24.0.9-1.el7
+  'stable': docker-ce-24.0.9-1.el7
+  'edge': docker-ce-24.0.9-1.el7
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli-18.09.9-3.el7
   '19.03': docker-ce-cli-19.03.15-3.el7
   '20.10': docker-ce-cli-20.10.20-3.el7
-  'stable': docker-ce-cli-20.10.20-3.el7
-  'edge': docker-ce-cli-20.10.20-3.el7
+  '23.0': docker-ce-cli-23.0.6-1.el7
+  '24.0': docker-ce-cli-24.0.9-1.el7
+  'stable': docker-ce-cli-24.0.9-1.el7
+  'edge': docker-ce-cli-24.0.9-1.el7
 
 docker_package_info:
   enablerepo: "docker-ce"

diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml
@@ -22,8 +22,9 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}-1.6.15-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'stable': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'edge': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
+  '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'stable': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'edge': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
 
 # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
 # https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/
@@ -33,16 +34,20 @@ docker_versioned_pkg:
   '18.09': docker-ce-3:18.09.9-3.el7
   '19.03': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
   '20.10': docker-ce-3:20.10.20-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-3:20.10.20-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-3:20.10.20-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-3:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli-1:18.09.9-3.el7
   '19.03': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
   '20.10': docker-ce-cli-1:20.10.20-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-cli-1:20.10.20-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-cli-1:20.10.20-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-cli-1:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_package_info:
   enablerepo: "docker-ce"

diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml
@@ -22,25 +22,30 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}=1.6.15-1"
   '1.6.16': "{{ containerd_package }}=1.6.16-1"
   '1.6.18': "{{ containerd_package }}=1.6.18-1"
-  'stable': "{{ containerd_package }}=1.6.18-1"
-  'edge': "{{ containerd_package }}=1.6.18-1"
+  '1.6.28': "{{ containerd_package }}=1.6.28-1"
+  'stable': "{{ containerd_package }}=1.6.28-1"
+  'edge': "{{ containerd_package }}=1.6.28-1"
 
 # https://download.docker.com/linux/ubuntu/
 docker_versioned_pkg:
   'latest': docker-ce
   '18.09': docker-ce=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release | lower }}
   '19.03': docker-ce=5:19.03.15~3-0~ubuntu-{{ ansible_distribution_release | lower }}
   '20.10': docker-ce=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
-  'stable': docker-ce=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
-  'edge': docker-ce=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
+  '23.0': docker-ce=5:23.0.6-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  '24.0': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  'stable': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  'edge': docker-ce=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli=5:18.09.9~3-0~ubuntu-{{ ansible_distribution_release | lower }}
   '19.03': docker-ce-cli=5:19.03.15~3-0~ubuntu-{{ ansible_distribution_release | lower }}
   '20.10': docker-ce-cli=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
-  'stable': docker-ce-cli=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
-  'edge': docker-ce-cli=5:20.10.20~3-0~ubuntu-{{ ansible_distribution_release | lower }}
+  '23.0': docker-ce-cli=5:23.0.6-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  '24.0': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  'stable': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
+  'edge': docker-ce-cli=5:24.0.9-1~ubuntu.{{ ansible_distribution_version }}~{{ ansible_distribution_release | lower }}
 
 docker_package_info:
   pkgs:

diff --git a/roles/container-engine/docker/vars/uniontech.yml b/roles/container-engine/docker/vars/uniontech.yml
@@ -20,8 +20,9 @@ containerd_versioned_pkg:
   '1.6.15': "{{ containerd_package }}-1.6.15-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}"
   '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'stable': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
-  'edge': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
+  '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'stable': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
+  'edge': "{{ containerd_package }}-1.6.28-3.1.el{{ ansible_distribution_major_version }}"
 
 docker_version: 19.03
 docker_cli_version: 19.03
@@ -34,16 +35,20 @@ docker_versioned_pkg:
   '18.09': docker-ce-3:18.09.9-3.el7
   '19.03': docker-ce-3:19.03.15-3.el{{ ansible_distribution_major_version }}
   '20.10': docker-ce-3:20.10.17-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-3:20.10.17-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-3:20.10.17-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-3:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-3:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_cli_versioned_pkg:
   'latest': docker-ce-cli
   '18.09': docker-ce-cli-1:18.09.9-3.el7
   '19.03': docker-ce-cli-1:19.03.15-3.el{{ ansible_distribution_major_version }}
   '20.10': docker-ce-cli-1:20.10.17-3.el{{ ansible_distribution_major_version }}
-  'stable': docker-ce-cli-1:20.10.17-3.el{{ ansible_distribution_major_version }}
-  'edge': docker-ce-cli-1:20.10.17-3.el{{ ansible_distribution_major_version }}
+  '23.0': docker-ce-cli-1:23.0.6-1.el{{ ansible_distribution_major_version }}
+  '24.0': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'stable': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
+  'edge': docker-ce-cli-1:24.0.9-1.el{{ ansible_distribution_major_version }}
 
 docker_package_info:
   enablerepo: "docker-ce"