Merge pull request #18196 from hakman/fix-disk-deletion

azure: Fix disk deletion by blocking on parent VMSS instead of VM instance

Author: k8s-ci-robot

pkg/resources/azure/azure.go

@@ -579,7 +579,13 @@ func (g *resourceGetter) listDisks(ctx context.Context) ([]*resources.Resource,
 func (g *resourceGetter) toDiskResource(disk *compute.Disk) *resources.Resource {
 	var blocked []string
 	if disk.ManagedBy != nil {
-		blocked = append(blocked, toKey(typeVMScaleSetVM, *disk.ManagedBy))
+		// Block on the parent VMScaleSet, not the individual VM instance.
+		// The raw ManagedBy path may not match the listed VM's resource ID,
+		// but parsing it to extract the parent VMSS gives a reliable match.
+		vmID, err := arm.ParseResourceID(*disk.ManagedBy)
+		if err == nil && vmID.Parent != nil {
+			blocked = append(blocked, toKey(typeVMScaleSet, vmID.Parent.String()))
+		}
 	}
 
 	return &resources.Resource{

pkg/resources/azure/azure_test.go

@@ -283,7 +283,7 @@ func TestListResourcesAzure(t *testing.T) {
 			rtype:   typeDisk,
 			name:    diskName,
 			blocks:  []string{toKey(typeResourceGroup, rgID)},
-			blocked: []string{toKey(typeVMScaleSetVM, vmID)},
+			blocked: []string{toKey(typeVMScaleSet, vmssID)},
 		},
 		toKey(typeRoleAssignment, raID): {
 			rtype:   typeRoleAssignment,
@@ -307,6 +307,49 @@ func TestListResourcesAzure(t *testing.T) {
 	}
 }
 
+func TestToDiskResource_ManagedBy(t *testing.T) {
+	g := resourceGetter{
+		clusterInfo: resources.ClusterInfo{
+			AzureSubscriptionID:    "sub",
+			AzureResourceGroupName: "rg",
+		},
+	}
+
+	diskID := "/subscriptions/sub/resourceGroups/rg/providers/Microsoft.Compute/disks/disk"
+	diskName := "disk"
+	vmssID := "/subscriptions/sub/resourceGroups/rg/providers/Microsoft.Compute/virtualMachineScaleSets/vmss"
+
+	tests := []struct {
+		name        string
+		managedBy   *string
+		wantBlocked []string
+	}{
+		{
+			name:      "nil ManagedBy",
+			managedBy: nil,
+		},
+		{
+			name:        "valid ManagedBy blocks on parent VMSS",
+			managedBy:   to.Ptr(vmssID + "/virtualMachines/0"),
+			wantBlocked: []string{toKey(typeVMScaleSet, vmssID)},
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			disk := &compute.Disk{
+				ID:        to.Ptr(diskID),
+				Name:      to.Ptr(diskName),
+				ManagedBy: tc.managedBy,
+			}
+			r := g.toDiskResource(disk)
+			if !reflect.DeepEqual(r.Blocked, tc.wantBlocked) {
+				t.Errorf("got Blocked=%v, want %v", r.Blocked, tc.wantBlocked)
+			}
+		})
+	}
+}
+
 func TestIsOwnedByCluster(t *testing.T) {
 	clusterName := "test-cluster"