Merge pull request #250 from pohly/controller-unpublish-volume-not-found

k8s-ci-robot · web-flow · commit 4dd974e48b39 · 2020-03-09T10:37:37.000-07:00
mock: avoid "not found" error in ControllerUnpublishVolume
diff --git a/mock/service/controller.go b/mock/service/controller.go
@@ -244,7 +244,9 @@ func (s *service) ControllerUnpublishVolume(
 
 	i, v := s.findVolNoLock("id", req.VolumeId)
 	if i < 0 {
-		return nil, status.Error(codes.NotFound, req.VolumeId)
+		// Not an error: a non-existent volume is not published.
+		// See also https://github.com/kubernetes-csi/external-attacher/pull/165
+		return &csi.ControllerUnpublishVolumeResponse{}, nil
 	}
 
 	// devPathKey is the key in the volume's attributes that is set to a

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,9 @@ func (s *service) ControllerUnpublishVolume(`
`244`	`244`
`245`	`245`	`i, v := s.findVolNoLock("id", req.VolumeId)`
`246`	`246`	`if i < 0 {`
`247`		`- return nil, status.Error(codes.NotFound, req.VolumeId)`
	`247`	`+ // Not an error: a non-existent volume is not published.`
	`248`	`+ // See also https://github.com/kubernetes-csi/external-attacher/pull/165`
	`249`	`+ return &csi.ControllerUnpublishVolumeResponse{}, nil`
`248`	`250`	`}`
`249`	`251`
`250`	`252`	`// devPathKey is the key in the volume's attributes that is set to a`