Skip to content

Commit

Permalink
containerd: add hashes for 1.5.8 and 1.4.12 and make 1.5.8 the new de…
Browse files Browse the repository at this point in the history
…fault
  • Loading branch information
cristicalin committed Nov 28, 2021
1 parent a5f88e1 commit f4365d1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Note: Upstart/SysV init based OS types are not supported.
- [kubernetes](https://github.com/kubernetes/kubernetes) v1.22.3
- [etcd](https://github.com/coreos/etcd) v3.5.0
- [docker](https://www.docker.com/) v20.10 (see note)
- [containerd](https://containerd.io/) v1.4.9
- [containerd](https://containerd.io/) v1.5.8
- [cri-o](http://cri-o.io/) v1.21 (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) v0.9.1
Expand Down
6 changes: 6 additions & 0 deletions roles/download/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -501,18 +501,24 @@ containerd_archive_checksums:
arm:
1.4.9: 0
1.4.11: 0
1.4.12: 0
1.5.5: 0
1.5.7: 0
1.5.8: 0
arm64:
1.4.9: 0
1.4.11: 0
1.4.12: 0
1.5.5: 0
1.5.7: 0
1.5.8: 0
amd64:
1.4.9: 346f88ad5b973960ff81b5539d4177af5941ec2e4703b479ca9a6081ff1d023b
1.4.11: 80c47ec5ce2cd91a15204b5f5b534892ca653e75f3fba0c451ca326bca45fb00
1.4.12: 26bb35ee8a2467029ca450352112ba3a0d2b8bf6b70bf040f62d91f3c501736c
1.5.5: 8efc527ffb772a82021800f0151374a3113ed2439922497ff08f2596a70f10f1
1.5.7: 109fc95b86382065ea668005c376360ddcd8c4ec413e7abe220ae9f461e0e173
1.5.8: feeda3f563edf0294e33b6c4b89bd7dbe0ee182ca61a2f9b8c3de2766bcbc99b

etcd_binary_checksum: "{{ etcd_binary_checksums[image_arch] }}"
cni_binary_checksum: "{{ cni_binary_checksums[image_arch] }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/kubespray-defaults/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ docker_plugins: []
etcd_kubeadm_enabled: false

# Containerd options - thse are relevant when container_manager == 'containerd'
containerd_version: 1.4.11
containerd_version: 1.5.8
containerd_use_systemd_cgroup: true

# Docker options - this is relevant when container_manager == 'docker'
Expand Down

0 comments on commit f4365d1

Please sign in to comment.