From 2db39d4856c410144c2fc0514f419d3ca757b190 Mon Sep 17 00:00:00 2001 From: Calin Cristian Andrei Date: Wed, 15 Jun 2022 12:22:40 +0300 Subject: [PATCH] [containerd] add hashes for 1.5.12, 1.5.13, 1.6.5 and 1.6.6 and make 1.6.6 the new default --- README.md | 2 +- roles/download/defaults/main.yml | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 558b4587a..faf79f039 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ Note: Upstart/SysV init based OS types are not supported. - [kubernetes](https://github.com/kubernetes/kubernetes) v1.24.1 - [etcd](https://github.com/etcd-io/etcd) v3.5.3 - [docker](https://www.docker.com/) v20.10 (see note) - - [containerd](https://containerd.io/) v1.6.4 + - [containerd](https://containerd.io/) v1.6.6 - [cri-o](http://cri-o.io/) v1.22 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS) - Network Plugin - [cni-plugins](https://github.com/containernetworking/plugins) v1.1.1 diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index cac0d3697..806864ce8 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -74,7 +74,7 @@ runc_version: v1.1.1 kata_containers_version: 2.4.1 youki_version: 0.0.1 gvisor_version: 20210921 -containerd_version: 1.6.4 +containerd_version: 1.6.6 cri_dockerd_version: 0.2.2 # this is relevant when container_manager == 'docker' @@ -680,11 +680,15 @@ containerd_archive_checksums: 1.5.9: 0 1.5.10: 0 1.5.11: 0 + 1.5.12: 0 + 1.5.13: 0 1.6.0: 0 1.6.1: 0 1.6.2: 0 1.6.3: 0 1.6.4: 0 + 1.6.5: 0 + 1.6.6: 0 arm64: 1.5.5: 0 1.5.7: 0 @@ -692,11 +696,15 @@ containerd_archive_checksums: 1.5.9: 0 1.5.10: 0 1.5.11: 0 + 1.5.12: 0 + 1.5.13: 0 1.6.0: 6eff3e16d44c89e1e8480a9ca078f79bab82af602818455cc162be344f64686a 1.6.1: fbeec71f2d37e0e4ceaaac2bdf081295add940a7a5c7a6bcc125e5bbae067791 1.6.2: a4b24b3c38a67852daa80f03ec2bc94e31a0f4393477cd7dc1c1a7c2d3eb2a95 1.6.3: 354e30d52ff94bd6cd7ceb8259bdf28419296b46cf5585e9492a87fdefcfe8b2 1.6.4: 0205bd1907154388dc85b1afeeb550cbb44c470ef4a290cb1daf91501c85cae6 + 1.6.5: 2833e2f0e8f3cb5044566d64121fdd92bbdfe523e9fe912259e936af280da62a + 1.6.6: 807bf333df331d713708ead66919189d7b142a0cc21ec32debbc988f9069d5eb amd64: 1.5.5: 8efc527ffb772a82021800f0151374a3113ed2439922497ff08f2596a70f10f1 1.5.7: 109fc95b86382065ea668005c376360ddcd8c4ec413e7abe220ae9f461e0e173 @@ -704,11 +712,15 @@ containerd_archive_checksums: 1.5.9: a457793a1643657588baf46d3ffbf44fae0139b65076064e237ddf29cd838ba4 1.5.10: 44f809e02233a510bb9d136906849e9ed058aa1d3d714244376001ab77464db7 1.5.11: f2a2476ca44a24067488cd6d0b064b2128e01f6f53e5f29c5acfaf1520927ee2 + 1.5.12: 301833f6377e9471a2cf1a1088ba98826db7e8fe9d3ffdc9f570b0638bcd3a1f + 1.5.13: 7b5b34f30a144985e849bdeb0921cfd3fe65f9508b5707fd237fd2c308d9abae 1.6.0: f77725e4f757523bf1472ec3b9e02b09303a5d99529173be0f11a6d39f5676e9 1.6.1: c1df0a12af2be019ca2d6c157f94e8ce7430484ab29948c9805882df40ec458b 1.6.2: 3d94f887de5f284b0d6ee61fa17ba413a7d60b4bb27d756a402b713a53685c6a 1.6.3: 306b3c77f0b5e28ed10d527edf3d73f56bf0a1fb296075af4483d8516b6975ed 1.6.4: f23c8ac914d748f85df94d3e82d11ca89ca9fe19a220ce61b99a05b070044de0 + 1.6.5: cf02a2da998bfcf61727c65ede6f53e89052a68190563a1799a7298b0cea86b4 + 1.6.6: 0212869675742081d70600a1afc6cea4388435cc52bf5dc21f4efdcb9a92d2ef ppc64le: 1.5.5: 0 1.5.7: 0 @@ -716,11 +728,15 @@ containerd_archive_checksums: 1.5.9: 0 1.5.10: 0 1.5.11: 0 + 1.5.12: 0 + 1.5.13: 0 1.6.0: 0 1.6.1: 0 1.6.2: 0 1.6.3: 0 1.6.4: 0 + 1.6.5: 0 + 1.6.6: 0 etcd_binary_checksum: "{{ etcd_binary_checksums[image_arch][etcd_version] }}" cni_binary_checksum: "{{ cni_binary_checksums[image_arch][cni_version] }}"