Merge pull request #102083 from andyzhangx/delete-disk-issue
fix: delete non existing disk issue
This commit is contained in:
		| @@ -21,6 +21,7 @@ package azure | ||||
| import ( | ||||
| 	"context" | ||||
| 	"fmt" | ||||
| 	"net/http" | ||||
| 	"path" | ||||
| 	"strconv" | ||||
| 	"strings" | ||||
| @@ -236,6 +237,10 @@ func (c *ManagedDiskController) DeleteManagedDisk(diskURI string) error { | ||||
|  | ||||
| 	rerr = c.common.cloud.DisksClient.Delete(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() | ||||
| 	} | ||||
| 	// We don't need poll here, k8s will immediately stop referencing the disk | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Kubernetes Prow Robot
					Kubernetes Prow Robot