Skip to content

Commit

Permalink
Update docker to 20.10.11 with containerd 1.4.12 (kubernetes-sigs#8255)
Browse files Browse the repository at this point in the history
  • Loading branch information
@floryut @LuckySB
floryut authored and LuckySB committed Jun 28, 2023
1 parent 53de8d0 commit 673facb
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 34 deletions.
3 changes: 2 additions & 1 deletion roles/container-engine/docker/vars/amazon.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ docker_versioned_pkg:
'latest': docker
'18.09': docker-18.09.9ce-2.amzn2
'19.03': docker-19.03.6ce-1.amzn2
'20.10': docker-20.10.7ce-1.amzn2

docker_version: "latest"

docker_package_info:
pkgs:
- "{{ docker_versioned_pkg[docker_version | string] }}"
enablerepo: amzn2extra-docker
enablerepo: amzn2extra-docker
17 changes: 9 additions & 8 deletions roles/container-engine/docker/vars/debian.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,26 @@ containerd_versioned_pkg:
'1.4.4': "{{ containerd_package }}=1.4.4-1"
'1.4.6': "{{ containerd_package }}=1.4.6-1"
'1.4.9': "{{ containerd_package }}=1.4.9-1"
'stable': "{{ containerd_package }}=1.4.9-1"
'edge': "{{ containerd_package }}=1.4.9-1"
'1.4.12': "{{ containerd_package }}=1.4.12-1"
'stable': "{{ containerd_package }}=1.4.12-1"
'edge': "{{ containerd_package }}=1.4.12-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.9~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:20.10.9~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:20.10.9~3-0~debian-{{ ansible_distribution_release|lower }}
'20.10': docker-ce=5:20.10.11~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:20.10.11~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:20.10.11~3-0~debian-{{ 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.9~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce-cli=5:20.10.9~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce-cli=5:20.10.9~3-0~debian-{{ ansible_distribution_release|lower }}
'20.10': docker-ce-cli=5:20.10.11~3-0~debian-{{ ansible_distribution_release|lower }}
'stable': docker-ce-cli=5:20.10.11~3-0~debian-{{ ansible_distribution_release|lower }}
'edge': docker-ce-cli=5:20.10.11~3-0~debian-{{ ansible_distribution_release|lower }}

docker_package_info:
pkgs:
Expand Down
17 changes: 9 additions & 8 deletions roles/container-engine/docker/vars/fedora.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@ containerd_versioned_pkg:
'1.4.4': "{{ containerd_package }}-1.4.4-3.1.fc{{ ansible_distribution_major_version }}"
'1.4.6': "{{ containerd_package }}-1.4.6-3.1.fc{{ ansible_distribution_major_version }}"
'1.4.9': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}"
'1.4.12': "{{ containerd_package }}-1.4.12-3.1.fc{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.4.12-3.1.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.4.12-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.9-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-20.10.9-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-20.10.9-3.fc{{ ansible_distribution_major_version }}
'20.10': docker-ce-20.10.11-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-20.10.11-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-20.10.11-3.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.9-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-cli-20.10.9-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-cli-20.10.9-3.fc{{ ansible_distribution_major_version }}
'20.10': docker-ce-cli-20.10.11-3.fc{{ ansible_distribution_major_version }}
'stable': docker-ce-cli-20.10.11-3.fc{{ ansible_distribution_major_version }}
'edge': docker-ce-cli-20.10.11-3.fc{{ ansible_distribution_major_version }}

docker_package_info:
enablerepo: "docker-ce"
Expand Down
17 changes: 9 additions & 8 deletions roles/container-engine/docker/vars/redhat.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ containerd_versioned_pkg:
'1.4.4': "{{ containerd_package }}-1.4.4-3.1.el{{ ansible_distribution_major_version }}"
'1.4.6': "{{ containerd_package }}-1.4.6-3.1.el{{ ansible_distribution_major_version }}"
'1.4.9': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}"
'1.4.12': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.4.12-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/
Expand All @@ -18,17 +19,17 @@ docker_versioned_pkg:
'latest': docker-ce
'18.09': docker-ce-18.09.9-3.el7
'19.03': docker-ce-19.03.15-3.el{{ ansible_distribution_major_version }}
'20.10': docker-ce-20.10.9-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-20.10.9-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-20.10.9-3.el{{ ansible_distribution_major_version }}
'20.10': docker-ce-20.10.11-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-20.10.11-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-20.10.11-3.el{{ ansible_distribution_major_version }}

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.el{{ ansible_distribution_major_version }}
'20.10': docker-ce-cli-20.10.9-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-cli-20.10.9-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-cli-20.10.9-3.el{{ ansible_distribution_major_version }}
'20.10': docker-ce-cli-20.10.11-3.el{{ ansible_distribution_major_version }}
'stable': docker-ce-cli-20.10.11-3.el{{ ansible_distribution_major_version }}
'edge': docker-ce-cli-20.10.11-3.el{{ ansible_distribution_major_version }}

docker_package_info:
enablerepo: "docker-ce"
Expand Down
17 changes: 9 additions & 8 deletions roles/container-engine/docker/vars/ubuntu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,26 @@ containerd_versioned_pkg:
'1.4.4': "{{ containerd_package }}=1.4.4-1"
'1.4.6': "{{ containerd_package }}=1.4.6-1"
'1.4.9': "{{ containerd_package }}=1.4.9-1"
'stable': "{{ containerd_package }}=1.4.9-1"
'edge': "{{ containerd_package }}=1.4.9-1"
'1.4.12': "{{ containerd_package }}=1.4.12-1"
'stable': "{{ containerd_package }}=1.4.12-1"
'edge': "{{ containerd_package }}=1.4.12-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.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:20.10.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:20.10.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'20.10': docker-ce=5:20.10.11~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce=5:20.10.11~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce=5:20.10.11~3-0~ubuntu-{{ 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.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce-cli=5:20.10.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce-cli=5:20.10.9~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'20.10': docker-ce-cli=5:20.10.11~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'stable': docker-ce-cli=5:20.10.11~3-0~ubuntu-{{ ansible_distribution_release|lower }}
'edge': docker-ce-cli=5:20.10.11~3-0~ubuntu-{{ ansible_distribution_release|lower }}

docker_package_info:
pkgs:
Expand Down
2 changes: 1 addition & 1 deletion roles/kubespray-defaults/defaults/main/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ containerd_version: 1.4.11
containerd_use_systemd_cgroup: true

# Docker options - this is relevant when container_manager == 'docker'
docker_containerd_version: 1.4.9
docker_containerd_version: 1.4.12

# Settings for containerized control plane (etcd/kubelet/secrets)
# deployment type for legacy etcd mode
Expand Down

0 comments on commit 673facb

Please sign in to comment.