From 739bde738e6e6a23f0c6d43142a9afc7d2595f6b Mon Sep 17 00:00:00 2001 From: rafzei Date: Wed, 2 Feb 2022 21:49:32 +0100 Subject: [PATCH] Hardcode containerd version, update components.md --- .../download-requirements/centos-7/requirements.aarch64.txt | 2 +- .../download-requirements/centos-7/requirements.x86_64.txt | 2 +- .../download-requirements/redhat-7/requirements.x86_64.txt | 2 +- .../download-requirements/ubuntu-20.04/requirements.x86_64.txt | 2 +- docs/home/COMPONENTS.md | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.aarch64.txt b/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.aarch64.txt index 7ecc3fe7f3..c75b511532 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.aarch64.txt +++ b/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.aarch64.txt @@ -26,7 +26,7 @@ bash-completion ca-certificates cifs-utils conntrack-tools # for kubelet -containerd.io +containerd.io-1.4.12 container-selinux #cri-tools-1.13.0 curl diff --git a/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.x86_64.txt b/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.x86_64.txt index fe4ac78f84..fa77cfea97 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.x86_64.txt +++ b/ansible/playbooks/roles/repository/files/download-requirements/centos-7/requirements.x86_64.txt @@ -26,7 +26,7 @@ bash-completion ca-certificates cifs-utils conntrack-tools # for kubelet -containerd.io +containerd.io-1.4.12 container-selinux cri-tools-1.13.0 curl diff --git a/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.x86_64.txt b/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.x86_64.txt index 86698c69fa..0d76c63999 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.x86_64.txt +++ b/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.x86_64.txt @@ -24,7 +24,7 @@ bash-completion ca-certificates cifs-utils conntrack-tools # for kubelet -containerd.io +containerd.io-1.4.12 container-selinux cri-tools-1.13.0 curl diff --git a/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-20.04/requirements.x86_64.txt b/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-20.04/requirements.x86_64.txt index a37ec22874..6de70d5e4f 100644 --- a/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-20.04/requirements.x86_64.txt +++ b/ansible/playbooks/roles/repository/files/download-requirements/ubuntu-20.04/requirements.x86_64.txt @@ -8,7 +8,7 @@ auditd bash-completion ca-certificates cifs-utils -containerd.io +containerd.io 1.4.12 cri-tools 1.13.0 curl docker-ce 5:20.10.8 diff --git a/docs/home/COMPONENTS.md b/docs/home/COMPONENTS.md index 8511441380..5e77ef75f2 100644 --- a/docs/home/COMPONENTS.md +++ b/docs/home/COMPONENTS.md @@ -9,6 +9,7 @@ Note that versions are default versions and can be changed in certain cases thro | Kubernetes | 1.22.4 | https://github.com/kubernetes/kubernetes | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) | | Kubernetes Dashboard | 2.3.1 | https://github.com/kubernetes/dashboard | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) | | Kubernetes metrics-scraper | 1.0.7 | https://github.com/kubernetes-sigs/dashboard-metrics-scraper | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) | +| Containerd | 1.4.12 | https://github.com/containerd/containerd | [Apache License 2.0](https://github.com/containerd/containerd/blob/main/LICENSE) | | Calico | 3.20.3 | https://github.com/projectcalico/calico | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) | | Flannel | 0.14.0 | https://github.com/coreos/flannel/ | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) | | Canal | 3.20.3 | https://github.com/projectcalico/calico | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |