diff --git a/roles/container-engine/docker/vars/debian.yml b/roles/container-engine/docker/vars/debian.yml index 39d82f47dcf850f58b4f93dec6ec916416d60c2e..f6d14d4fb2deb7112ef93cf555f07101b22af3a4 100644 --- a/roles/container-engine/docker/vars/debian.yml +++ b/roles/container-engine/docker/vars/debian.yml @@ -24,8 +24,9 @@ containerd_versioned_pkg: '1.6.18': "{{ containerd_package }}=1.6.18-1" '1.6.28': "{{ containerd_package }}=1.6.28-2" '1.6.31': "{{ containerd_package }}=1.6.31-1" - 'stable': "{{ containerd_package }}=1.6.31-1" - 'edge': "{{ containerd_package }}=1.6.31-1" + '1.6.32': "{{ containerd_package }}=1.6.32-1" + 'stable': "{{ containerd_package }}=1.6.32-1" + 'edge': "{{ containerd_package }}=1.6.32-1" # https://download.docker.com/linux/debian/ docker_versioned_pkg: diff --git a/roles/container-engine/docker/vars/fedora.yml b/roles/container-engine/docker/vars/fedora.yml index 9fe6c5c24055a8915f08b13119ad8dde070dfbdd..392e5536d4988b1dc7157f06d53b568d8d70a73c 100644 --- a/roles/container-engine/docker/vars/fedora.yml +++ b/roles/container-engine/docker/vars/fedora.yml @@ -24,8 +24,9 @@ containerd_versioned_pkg: '1.6.18': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}" '1.6.28': "{{ containerd_package }}-1.6.28-3.2.fc{{ ansible_distribution_major_version }}" '1.6.31': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" - 'stable': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" - 'edge': "{{ containerd_package }}-1.6.31-3.1.fc{{ ansible_distribution_major_version }}" + '1.6.32': "{{ containerd_package }}-1.6.32-3.1.fc{{ ansible_distribution_major_version }}" + 'stable': "{{ containerd_package }}-1.6.32-3.1.fc{{ ansible_distribution_major_version }}" + 'edge': "{{ containerd_package }}-1.6.32-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/ diff --git a/roles/container-engine/docker/vars/kylin.yml b/roles/container-engine/docker/vars/kylin.yml index 7531a9d711d4c917d7d6cec2fc21240d3be27b74..d79cf83303dd52d773425978aeec70f556c91774 100644 --- a/roles/container-engine/docker/vars/kylin.yml +++ b/roles/container-engine/docker/vars/kylin.yml @@ -29,8 +29,9 @@ containerd_versioned_pkg: '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el8" '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el8" '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el8" - 'stable': "{{ containerd_package }}-1.6.31-3.1.el8" - 'edge': "{{ containerd_package }}-1.6.31-3.1.el8" + '1.6.32': "{{ containerd_package }}-1.6.32-3.1.el8" + 'stable': "{{ containerd_package }}-1.6.32-3.1.el8" + 'edge': "{{ containerd_package }}-1.6.32-3.1.el8" # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://download.docker.com/linux/centos/8/x86_64/stable/Packages/ diff --git a/roles/container-engine/docker/vars/redhat-7.yml b/roles/container-engine/docker/vars/redhat-7.yml index 0af670351421565645b73bc0252c46a3c9b7c45d..26ec59cccfaf1d384cd47afbc3f1f124ff611194 100644 --- a/roles/container-engine/docker/vars/redhat-7.yml +++ b/roles/container-engine/docker/vars/redhat-7.yml @@ -24,8 +24,9 @@ containerd_versioned_pkg: '1.6.18': "{{ containerd_package }}-1.6.18-3.1.el7" '1.6.28': "{{ containerd_package }}-1.6.28-3.1.el7" '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el7" - 'stable': "{{ containerd_package }}-1.6.31-3.1.el7" - 'edge': "{{ containerd_package }}-1.6.31-3.1.el7" + '1.6.32': "{{ containerd_package }}-1.6.32-3.1.el7" + 'stable': "{{ containerd_package }}-1.6.32-3.1.el7" + 'edge': "{{ containerd_package }}-1.6.32-3.1.el7" # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/ diff --git a/roles/container-engine/docker/vars/redhat.yml b/roles/container-engine/docker/vars/redhat.yml index ad1105a666854b75d57b7ce80f063bcd85c336de..deead325c7281a822aeac1d40a6adb1b1e8ef512 100644 --- a/roles/container-engine/docker/vars/redhat.yml +++ b/roles/container-engine/docker/vars/redhat.yml @@ -24,8 +24,9 @@ containerd_versioned_pkg: '1.6.18': "{{ 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 }}" '1.6.31': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" - 'stable': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" - 'edge': "{{ containerd_package }}-1.6.31-3.1.el{{ ansible_distribution_major_version }}" + '1.6.32': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}" + 'stable': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}" + 'edge': "{{ containerd_package }}-1.6.32-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/ diff --git a/roles/container-engine/docker/vars/ubuntu.yml b/roles/container-engine/docker/vars/ubuntu.yml index c753af395a2eecebfe0af713fc927f76529ae1a9..636e417323270383a56f3c99efb6134e95c9700e 100644 --- a/roles/container-engine/docker/vars/ubuntu.yml +++ b/roles/container-engine/docker/vars/ubuntu.yml @@ -24,8 +24,9 @@ containerd_versioned_pkg: '1.6.18': "{{ containerd_package }}=1.6.18-1" '1.6.28': "{{ containerd_package }}=1.6.28-2" '1.6.31': "{{ containerd_package }}=1.6.31-1" - 'stable': "{{ containerd_package }}=1.6.31-1" - 'edge': "{{ containerd_package }}=1.6.31-1" + '1.6.32': "{{ containerd_package }}=1.6.32-1" + 'stable': "{{ containerd_package }}=1.6.32-1" + 'edge': "{{ containerd_package }}=1.6.32-1" # https://download.docker.com/linux/ubuntu/ docker_versioned_pkg: diff --git a/roles/container-engine/docker/vars/uniontech.yml b/roles/container-engine/docker/vars/uniontech.yml index 0749726d1cf7267d1f5a3fb4f0d89404325dbbaf..13e1cd67338d3fcdd62cd7f194a767d54af7c1f3 100644 --- a/roles/container-engine/docker/vars/uniontech.yml +++ b/roles/container-engine/docker/vars/uniontech.yml @@ -21,8 +21,9 @@ containerd_versioned_pkg: '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 }}" '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 }}" + '1.6.32': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}" + 'stable': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}" + 'edge': "{{ containerd_package }}-1.6.32-3.1.el{{ ansible_distribution_major_version }}" docker_version: 19.03 docker_cli_version: 19.03 diff --git a/roles/kubespray-defaults/defaults/main/download.yml b/roles/kubespray-defaults/defaults/main/download.yml index 0bd1ac503c7cbe3e46f341e4482145aae094c856..ca21d4407d309f277b1a6e281865670b4dac563c 100644 --- a/roles/kubespray-defaults/defaults/main/download.yml +++ b/roles/kubespray-defaults/defaults/main/download.yml @@ -84,7 +84,7 @@ containerd_version: 1.7.16 cri_dockerd_version: 0.3.11 # this is relevant when container_manager == 'docker' -docker_containerd_version: 1.6.28 +docker_containerd_version: 1.6.32 # gcr and kubernetes image repo define gcr_image_repo: "gcr.io"