Merge pull request kubernetes#90792 from jsafrane/cinder-resize-event

k8s-ci-robot · web-flow · commit 5777b913a323 · 2020-05-16T09:45:35.000-07:00
Send a nicer event when resizing attached Cinder volume
diff --git a/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go b/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_volumes.go
@@ -419,7 +419,12 @@ func (os *OpenStack) ExpandVolume(volumeID string, oldSize resource.Quantity, ne
 	}
 	if volume.Status != volumeAvailableStatus {
 		// cinder volume can not be expanded if its status is not available
-		return oldSize, fmt.Errorf("volume in %s status can not be expanded, it must be available and not attached to a node", volume.Status)
+		if volume.Status == volumeInUseStatus {
+			// Send a nice event when the volume is used
+			return oldSize, fmt.Errorf("PVC used by a Pod can not be expanded, please ensure the PVC is not used by any Pod and is fully detached from a node")
+		}
+		// Send not so nice event when the volume is in any other state (deleted, error)
+		return oldSize, fmt.Errorf("volume in state %q can not be expanded, it must be \"available\"", volume.Status)
 	}
 
 	// Cinder works with gigabytes, convert to GiB with rounding up

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,12 @@ func (os *OpenStack) ExpandVolume(volumeID string, oldSize resource.Quantity, ne`
`419`	`419`	`}`
`420`	`420`	`if volume.Status != volumeAvailableStatus {`
`421`	`421`	`// cinder volume can not be expanded if its status is not available`
`422`		`- return oldSize, fmt.Errorf("volume in %s status can not be expanded, it must be available and not attached to a node", volume.Status)`
	`422`	`+ if volume.Status == volumeInUseStatus {`
	`423`	`+ // Send a nice event when the volume is used`
	`424`	`+ return oldSize, fmt.Errorf("PVC used by a Pod can not be expanded, please ensure the PVC is not used by any Pod and is fully detached from a node")`
	`425`	`+ }`
	`426`	`+ // Send not so nice event when the volume is in any other state (deleted, error)`
	`427`	`+ return oldSize, fmt.Errorf("volume in state %q can not be expanded, it must be \"available\"", volume.Status)`
`423`	`428`	`}`
`424`	`429`
`425`	`430`	`// Cinder works with gigabytes, convert to GiB with rounding up`