backport for hitachienergy#3006

cicharka · Apr 8, 2022 · 92b34bc · 92b34bc
1 parent da69ec5
commit 92b34bc
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/ansible/playbooks/roles/docker/defaults/main.yml b/ansible/playbooks/roles/docker/defaults/main.yml
@@ -14,3 +14,5 @@ docker_daemon_defaults:
 docker_version:
   Debian: "5:20.10.8*" # * is needed to match a version such as '5:19.03.14~3-0~ubuntu-bionic'
   RedHat: "20.10.8"
+
+containerd_version: "1.5.11"
diff --git a/ansible/playbooks/roles/docker/tasks/main.yml b/ansible/playbooks/roles/docker/tasks/main.yml
@@ -8,12 +8,12 @@
   vars:
     _packages:
       Debian:
-        - containerd.io
+        - containerd.io={{ containerd_version }}
         - docker-ce-cli={{ docker_version.Debian }}
         - docker-ce-rootless-extras={{ docker_version.Debian }}
         - docker-ce={{ docker_version.Debian }}
       RedHat:
-        - containerd.io
+        - containerd.io-{{ containerd_version }}
         - docker-ce-cli-{{ docker_version.RedHat }}
         - docker-ce-rootless-extras-{{ docker_version.RedHat }}
         - docker-ce-{{ docker_version.RedHat }}

diff --git a/ansible/playbooks/roles/haproxy_runc/defaults/main.yml b/ansible/playbooks/roles/haproxy_runc/defaults/main.yml
@@ -5,3 +5,4 @@ haproxy_image_tag: "{{ haproxy_version }}-alpine"
 haproxy_image_tar: "haproxy-{{ haproxy_image_tag }}.tar"
 extra_mounts: []
 haproxy_upgrade_enabled: false
+containerd_version: "1.5.11"
diff --git 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,5 @@
   apt:
     update_cache: true
     name:
-      - containerd.io  # provides "runc"
+      - containerd.io={{ containerd_version }}  # provides "runc"
     state: present
diff --git a/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-RedHat.yml b/ansible/playbooks/roles/haproxy_runc/tasks/install-packages-RedHat.yml
@@ -3,5 +3,5 @@
   yum:
     update_cache: true
     name:
-      - containerd.io  # provides "runc"
+      - containerd.io-{{ containerd_version }}  # provides "runc"
     state: present
diff --git a/.../playbooks/roles/repository/files/download-requirements/centos-7/requirements.aarch64.txt b/.../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.5.11
 container-selinux
 #cri-tools-1.13.0
 curl

diff --git a/...e/playbooks/roles/repository/files/download-requirements/centos-7/requirements.x86_64.txt b/...e/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.5.11
 container-selinux
 cri-tools-1.13.0
 curl

diff --git a/...e/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.x86_64.txt b/...e/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.5.11
 container-selinux
 cri-tools-1.13.0
 curl

diff --git a/...aybooks/roles/repository/files/download-requirements/ubuntu-20.04/requirements.x86_64.txt b/...aybooks/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.5.11
 cri-tools 1.13.0
 curl
 docker-ce 5:20.10.8

diff --git a/cli/epicli.py b/cli/epicli.py
@@ -233,9 +233,9 @@ def delete_parser(subparsers):
     sub_parser._action_groups.append(optional)
 
     def run_delete(args):
-        if not query_yes_no('You are trying to delete your cluster. '
-                            'If your configuration does not allow to keep the existing disks used in the cluster, you will lose your data. '
-                            'Make sure your data is safe. Do you really want to delete your cluster?'):
+        if not query_yes_no('''You are trying to delete your cluster.
+If your configuration does not allow to keep the existing disks used in the cluster, you will lose your data.
+Make sure your data is safe. Do you really want to delete your cluster?'''):
             return 0
         adjust_paths_from_build(args)
         with DeleteEngine(args) as engine:

diff --git a/docs/changelogs/CHANGELOG-1.3.md b/docs/changelogs/CHANGELOG-1.3.md
@@ -5,6 +5,7 @@
 ### Fixed
 
 - [#3065](https://github.com/epiphany-platform/epiphany/issues/3065) - Flag `delete_os_disk_on_termination` has no effect when removing cluster
+- [#3006](https://github.com/epiphany-platform/epiphany/issues/3006) - install 'containerd.io=1.4.12-*' failed, when upgrade from v1.3.0 to 2.0.0dev
 
 ## [1.3.0] 2022-01-19