From 3ed23f3e99fd5c50b532fc934455fe8ddb3db21f Mon Sep 17 00:00:00 2001 From: rafzei Date: Fri, 27 May 2022 14:59:12 +0200 Subject: [PATCH] Source containerd version and allow downgrade --- .../roles/haproxy_runc/tasks/install-packages-Debian.yml | 3 ++- .../roles/haproxy_runc/tasks/install-packages-RedHat.yml | 5 +++-- docs/changelogs/CHANGELOG-2.0.md | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-Debian.yml b/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-Debian.yml index be92c1e13b..20a95056a5 100644 --- a/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-Debian.yml +++ b/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-Debian.yml @@ -3,5 +3,6 @@ apt: update_cache: true name: - - containerd.io # provides "runc" + - containerd.io={{ containerd_defaults.containerd_version }}-* # provides "runc" state: present + allow_downgrade: true diff --git a/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-RedHat.yml b/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-RedHat.yml index 99cdc268a5..e6f66c4161 100644 --- a/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-RedHat.yml +++ b/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-RedHat.yml @@ -1,7 +1,8 @@ ---- + - name: Install containerd.io package for RedHat family yum: update_cache: true name: - - containerd.io # provides "runc" + - containerd.io-{{ containerd_defaults.containerd_version }} # provides "runc" state: present + allow_downgrade: true diff --git a/docs/changelogs/CHANGELOG-2.0.md b/docs/changelogs/CHANGELOG-2.0.md index 4111b0ea03..215167e409 100644 --- a/docs/changelogs/CHANGELOG-2.0.md +++ b/docs/changelogs/CHANGELOG-2.0.md @@ -6,6 +6,10 @@ - [#2932](https://github.com/epiphany-platform/epiphany/issues/2932) - Support `epicli upgrade` for RHEL/AlmaLinux 8 +### Fixed + +- [#3164](https://github.com/epiphany-platform/epiphany/issues/3164) - Specify version and allow containerd.io package downgrade in haproxy_runc role + ### Updated - [#3080](https://github.com/epiphany-platform/epiphany/issues/3080) - update Filebeat to the latest compatible version with OpenSearch