Merge pull request #59569 from tsmetana/fix-aws-detach

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. AWS: Do not ignore errors from EC2::DescribeVolume in DetachDisk The DetachDisk method of AWS cloudprovider indirectly calls EC2::DescribeVolume AWS API function to check if the volume being detached is really attached to the specified node. The AWS API call may fail and return error which is logged however the DetachDisk then finishes successfully. This may cause the AWS volumes to remain attached to the instances forever because the attach/detach controller will mark the volume as attached. The PV controller will never be able to delete those disks and they need to be detached manually. This patch ensures the error from DescribeVolume is propagated to attach/detach controller and the detach operation is re-tried. cc: @gnufied, @jsafrane ```release-note NONE ```

Merge pull request #59569 from tsmetana/fix-aws-detach
2172a2a8 · Kubernetes Submit Queue · GitHub · 24f38712 · c879e531 · 2172a2a8
Unverified Commit 2172a2a8 authored Feb 08, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 08, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

aws.go pkg/cloudprovider/providers/aws/aws.go +1 -1

No files found.
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -2013,7 +2013,7 @@ func (c *Cloud) AttachDisk(diskName KubernetesVolumeID, nodeName types.NodeName,
 // DetachDisk implements Volumes.DetachDisk
 func (c *Cloud) DetachDisk(diskName KubernetesVolumeID, nodeName types.NodeName) (string, error) {
 	diskInfo, attached, err := c.checkIfAttachedToNode(diskName, nodeName)
-	if diskInfo == nil {
+	if err != nil {
 		return "", err
 	}