made ControllerUnpublishVolume call idempotent (kubernetes#1500)

agoblet · web-flow · commit ddc7a5b9d62f · 2021-04-28T05:34:50.000-07:00
diff --git a/pkg/csi/cinder/openstack/openstack_volumes.go b/pkg/csi/cinder/openstack/openstack_volumes.go
@@ -282,7 +282,8 @@ func (os *OpenStack) DetachVolume(instanceID, volumeID string) error {
 		}
 	}
 
-	return fmt.Errorf("disk: %s has no attachments or not attached to compute %s", volume.ID, instanceID)
+	// Disk has no attachments or not attached to provided compute
+	return nil
 }
 
 // WaitDiskDetached waits for detached

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,8 @@ func (os *OpenStack) DetachVolume(instanceID, volumeID string) error {`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`
`285`		`- return fmt.Errorf("disk: %s has no attachments or not attached to compute %s", volume.ID, instanceID)`
	`285`	`+ // Disk has no attachments or not attached to provided compute`
	`286`	`+ return nil`
`286`	`287`	`}`
`287`	`288`
`288`	`289`	`// WaitDiskDetached waits for detached`