diff --git a/ansible/playbooks/roles/docker/defaults/main.yml b/ansible/playbooks/roles/docker/defaults/main.yml index 3ae15e4f88..ac9e082676 100644 --- 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 index aef03c16b2..1ca9b81132 100644 --- 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 index 815b6de8ae..3a91df24b2 100644 --- 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 index be92c1e13b..8560bc3643 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,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 index 99cdc268a5..6826a18fab 100644 --- 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/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 3fa1e46563..d9e3985ce1 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.5.11 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 8dc6f611fb..1331372119 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.5.11 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 79ab22372d..27b25abd6a 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.5.11 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 37a928db2f..103ccb5afd 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.5.11 cri-tools 1.13.0 curl docker-ce 5:20.10.8 diff --git a/cli/epicli.py b/cli/epicli.py index 42192131f6..89e0783f97 100644 --- a/cli/epicli.py +++ b/cli/epicli.py @@ -233,7 +233,9 @@ def delete_parser(subparsers): sub_parser._action_groups.append(optional) def run_delete(args): - if not query_yes_no('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 index 0190c313f2..42325e18b6 100644 --- a/docs/changelogs/CHANGELOG-1.3.md +++ b/docs/changelogs/CHANGELOG-1.3.md @@ -7,6 +7,8 @@ - [#2997](https://github.com/epiphany-platform/epiphany/issues/2997) - Doubled HAProxy entries in prometheus.yml after upgrade - [#2996](https://github.com/epiphany-platform/epiphany/issues/2996) - Introduce the new configuration field to change a component name - [#3034](https://github.com/epiphany-platform/epiphany/issues/3034) - [RHEL/CentOS] GPG signature could not be verified for Kubernetes repository +- [#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 diff --git a/docs/home/howto/CLUSTER.md b/docs/home/howto/CLUSTER.md index b5e3c9fecb..b22e3d053b 100644 --- a/docs/home/howto/CLUSTER.md +++ b/docs/home/howto/CLUSTER.md @@ -588,6 +588,11 @@ Epicli has a delete command to remove a cluster from a cloud provider (AWS, Azur From the defined cluster build folder it will take the information needed to remove the resources from the cloud provider. +### Note for Azure cloud provider + +Make sure you can safely remove OS and data disks - Epiphany does not support cluster removal from Azure +while preserving existing disks. + ## Single machine cluster *Please read first prerequisites related to [hostname requirements](./PREREQUISITES.md#hostname-requirements).* diff --git a/schema/azure/defaults/infrastructure/virtual-machine.yml b/schema/azure/defaults/infrastructure/virtual-machine.yml index 70eabd28be..c7e1b65a07 100644 --- a/schema/azure/defaults/infrastructure/virtual-machine.yml +++ b/schema/azure/defaults/infrastructure/virtual-machine.yml @@ -20,7 +20,6 @@ specification: sku: 20_04-lts-gen2 version: "20.04.202201100" # Never put latest on anything! Need to always pin the version number but testing we can get away with it storage_os_disk: - delete_on_termination: false managed: false caching: ReadWrite create_option: FromImage diff --git a/schema/azure/validation/infrastructure/virtual-machine.yml b/schema/azure/validation/infrastructure/virtual-machine.yml index 9148aefb0e..c160a8da53 100644 --- a/schema/azure/validation/infrastructure/virtual-machine.yml +++ b/schema/azure/validation/infrastructure/virtual-machine.yml @@ -41,8 +41,6 @@ properties: storage_os_disk: type: object properties: - delete_on_termination: - type: boolean managed: type: boolean caching: diff --git a/terraform/azure/infrastructure/virtual-machine.j2 b/terraform/azure/infrastructure/virtual-machine.j2 index 2e81de148d..bd38fd338e 100644 --- a/terraform/azure/infrastructure/virtual-machine.j2 +++ b/terraform/azure/infrastructure/virtual-machine.j2 @@ -49,10 +49,6 @@ resource "azurerm_virtual_machine" "{{ specification.name }}" { # windows specific stuff here maybe... hopefully never. {%- endif %} - {%- if specification.storage_os_disk.managed != true %} - delete_os_disk_on_termination = "{{ specification.storage_os_disk.delete_on_termination | lower }}" - {%- endif %} - storage_os_disk { name = "{{ specification.name }}-os-disk" caching = "{{ specification.storage_os_disk.caching }}"