Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #88360: fix: check disk status before delete azure disk #89203

Merged
merged 1 commit into from Apr 4, 2020
Merged

Automated cherry pick of #88360: fix: check disk status before delete azure disk #89203

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go
View file
Open in desktop
Expand Up @@ -189,6 +189,15 @@ func (c *ManagedDiskController) DeleteManagedDisk(diskURI string) error {
return fmt.Errorf("failed to delete disk(%s) since it's in attaching or detaching state", diskURI)
}

disk, err := c.common.cloud.DisksClient.Get(ctx, resourceGroup, diskName)
if err != nil {
return err
}

if disk.ManagedBy != nil {
return fmt.Errorf("disk(%s) already attached to node(%s), could not be deleted", diskURI, *disk.ManagedBy)
}

_, err = c.common.cloud.DisksClient.Delete(ctx, resourceGroup, diskName)
if err != nil {
return err
Expand Down