Ignore NotFound error on ControllerUnpublish

Assume that the volume is detached.

Author: jsafrane

pkg/attacher/attacher.go

@@ -86,6 +86,20 @@ func (a *attacher) Detach(ctx context.Context, volumeID string, nodeID string, s
 	}
 
 	_, err := client.ControllerUnpublishVolume(ctx, &req)
+	if err != nil {
+		// Consume NotFound error.
+		st, ok := status.FromError(err)
+		if !ok {
+			// This is not gRPC error.
+			return err
+		}
+		if st.Code() == codes.NotFound {
+			// Consume the error, the volume or the node has been deleted
+			// and the volume must have been detached.
+			klog.Warningf("Got NotFound error when detaching volume %q from node %q. Assuming the volume is detached.", volumeID, nodeID)
+			return nil
+		}
+	}
 	return err
 }
 

pkg/attacher/attacher_test.go

@@ -323,7 +323,7 @@ func TestDetachAttach(t *testing.T) {
 			nodeID:      defaultNodeID,
 			input:       defaultRequest,
 			output:      nil,
-			injectError: codes.NotFound,
+			injectError: codes.PermissionDenied,
 			expectError: true,
 		},
 		{
@@ -335,6 +335,15 @@ func TestDetachAttach(t *testing.T) {
 			injectError: codes.DeadlineExceeded,
 			expectError: true,
 		},
+		{
+			name:        "gRPC NotFound error",
+			volumeID:    defaultVolumeID,
+			nodeID:      defaultNodeID,
+			input:       defaultRequest,
+			output:      nil,
+			injectError: codes.NotFound,
+			expectError: false,
+		},
 	}
 
 	tmpdir := tempDir(t)