azure: fix for #3065

hitachienergy · Apr 7, 2022 · dfc505c · dfc505c
1 parent a0811a1
commit dfc505c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md
@@ -13,6 +13,7 @@
 - [#2653](https://github.com/epiphany-platform/epiphany/issues/2653) - Epicli is failing in air-gapped infra mode
 - [#3004](https://github.com/epiphany-platform/epiphany/issues/3004) - `disk_size_gb` hardcoded in `/usr/local/epicli/data/azure/defaults/infrastructure/virtual-machine.yml`
 - [#2934](https://github.com/epiphany-platform/epiphany/issues/2934) - Duplicated entries in image-registry defaults (LTS)
+- [#3065](https://github.com/epiphany-platform/epiphany/issues/3065) - Flag `delete_os_disk_on_termination` has no effect when removing cluster
 
 ## [1.0.2] 2022-01-26
 

diff --git a/core/src/epicli/cli/epicli.py b/core/src/epicli/cli/epicli.py
@@ -227,7 +227,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/core/src/epicli/data/azure/defaults/infrastructure/virtual-machine.yml b/core/src/epicli/data/azure/defaults/infrastructure/virtual-machine.yml
@@ -20,7 +20,6 @@ specification:
     sku: 18.04-LTS
     version: "18.04.202103151" # 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/core/src/epicli/data/azure/terraform/infrastructure/virtual-machine.j2 b/core/src/epicli/data/azure/terraform/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 }}"

diff --git a/core/src/epicli/data/azure/validation/infrastructure/virtual-machine.yml b/core/src/epicli/data/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/docs/home/howto/CLUSTER.md b/docs/home/howto/CLUSTER.md
@@ -569,6 +569,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).*