From 5e334b02550bcf03de9d54ae06c63487a5898988 Mon Sep 17 00:00:00 2001
From: Sebastian Heid <8442432+s4heid@users.noreply.github.com>
Date: Mon, 31 Aug 2026 18:31:42 +0200
Subject: [PATCH 1/2] Use managed disks by default on Azure

Remove the redundant managed-disks ops file and storage account variables.
Unmanaged disk creation requests are answered with the following error:

> Unmanaged disks have been retired. Please migrate to Managed Disks. More
> details available here:
> https://learn.microsoft.com/en-us/azure/virtual-machines/unmanaged-disks-deprecation
---
 azure/cpi-secondary.yml     |  2 +-
 azure/cpi.yml               |  4 ++--
 azure/use-managed-disks.yml | 14 --------------
 tests/run-checks.sh         |  4 ----
 4 files changed, 3 insertions(+), 21 deletions(-)
 delete mode 100644 azure/use-managed-disks.yml

diff --git a/azure/cpi-secondary.yml b/azure/cpi-secondary.yml
index a64c953bc..5306e5408 100644
--- a/azure/cpi-secondary.yml
+++ b/azure/cpi-secondary.yml
@@ -21,6 +21,6 @@
     resource_group_name: unused
     ssh_public_key: unused
     ssh_user: unused
-    storage_account_name: unused
     subscription_id: unused
     tenant_id: unused
+    use_managed_disks: true
diff --git a/azure/cpi.yml b/azure/cpi.yml
index bec19fb74..b4fdce31c 100644
--- a/azure/cpi.yml
+++ b/azure/cpi.yml
@@ -44,9 +44,9 @@
     resource_group_name: ((resource_group_name))
     ssh_public_key: ((ssh.public_key))
     ssh_user: vcap
-    storage_account_name: ((storage_account_name))
     subscription_id: ((subscription_id))
     tenant_id: ((tenant_id))
+    use_managed_disks: true
 - path: /cloud_provider/properties/azure?
   type: replace
   value:
@@ -57,9 +57,9 @@
     resource_group_name: ((resource_group_name))
     ssh_public_key: ((ssh.public_key))
     ssh_user: vcap
-    storage_account_name: ((storage_account_name))
     subscription_id: ((subscription_id))
     tenant_id: ((tenant_id))
+    use_managed_disks: true
 - path: /variables/-
   type: replace
   value:
diff --git a/azure/use-managed-disks.yml b/azure/use-managed-disks.yml
deleted file mode 100644
index f201dc6b9..000000000
--- a/azure/use-managed-disks.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- type: replace
-  path: /instance_groups/name=bosh/properties/azure/use_managed_disks?
-  value: true
-
-- type: remove
-  path: /instance_groups/name=bosh/properties/azure/storage_account_name
-
-- type: replace
-  path: /cloud_provider/properties/azure/use_managed_disks?
-  value: true
-
-- type: remove
-  path: /cloud_provider/properties/azure/storage_account_name
diff --git a/tests/run-checks.sh b/tests/run-checks.sh
index 9a84bf9d5..89e72b6ec 100755
--- a/tests/run-checks.sh
+++ b/tests/run-checks.sh
@@ -444,7 +444,6 @@ bosh create-env bosh.yml \
   -v client_id=test \
   -v client_secret=test \
   -v resource_group_name=test \
-  -v storage_account_name=test \
   -v default_security_group=nsg-bosh
 
 echo "- Azure (custom-environment)"
@@ -465,7 +464,6 @@ bosh create-env bosh.yml \
   -v client_id=test \
   -v client_secret=test \
   -v resource_group_name=test \
-  -v storage_account_name=test \
   -v default_security_group=nsg-bosh
 
 echo "- Azure (managed-identity)"
@@ -483,7 +481,6 @@ bosh create-env bosh.yml \
   -v subscription_id=test \
   -v azure-managed-identity=test \
   -v resource_group_name=test \
-  -v storage_account_name=test \
   -v default_security_group=nsg-bosh
 
 echo "- Azure (managed-identity-for-bosh-managed-vms)"
@@ -502,7 +499,6 @@ bosh create-env bosh.yml \
   -v subscription_id=test \
   -v azure-managed-identity=test \
   -v resource_group_name=test \
-  -v storage_account_name=test \
   -v default_security_group=nsg-bosh
 
 echo "- Azure (cloud-config)"

From a514a6530c6230dca11064a5a3492282bb492141 Mon Sep 17 00:00:00 2001
From: Sebastian Heid <8442432+s4heid@users.noreply.github.com>
Date: Mon, 31 Aug 2026 20:53:34 +0200
Subject: [PATCH 2/2] Avoid breaking consumers of the Azure managed disks ops
 file

---
 azure/use-managed-disks.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 azure/use-managed-disks.yml

diff --git a/azure/use-managed-disks.yml b/azure/use-managed-disks.yml
new file mode 100644
index 000000000..bb9d48aeb
--- /dev/null
+++ b/azure/use-managed-disks.yml
@@ -0,0 +1,3 @@
+# Managed disks are now enabled by default in azure/cpi.yml.
+# Keeping this ops-file for backwards compatibility.
+---