Merge pull request #107406 from andyzhangx/delete-disk-error

fix: delete non existing Azure disk issue
kubernetes · Jan 15, 2022 · 7bde4ba · 7bde4ba
2 parents a4931cc + 8f9846c
commit 7bde4ba
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go b/staging/src/k8s.io/legacy-cloud-providers/azure/azure_managedDiskController.go
@@ -229,6 +229,10 @@ func (c *ManagedDiskController) DeleteManagedDisk(diskURI string) error {
 
 	disk, rerr := c.common.cloud.DisksClient.Get(ctx, resourceGroup, diskName)
 	if rerr != nil {
+		if rerr.HTTPStatusCode == http.StatusNotFound {
+			klog.V(2).Infof("azureDisk - disk(%s) is already deleted", diskURI)
+			return nil
+		}
 		return rerr.Error()
 	}