fix(instance): wait for volumes to be available before deletion (#4388)

scaleway · Dec 27, 2024 · 3cf1e63 · 3cf1e63
1 parent 5affb66
commit 3cf1e63
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/internal/namespaces/instance/v1/custom_server_delete.go b/internal/namespaces/instance/v1/custom_server_delete.go
@@ -234,9 +234,11 @@ func serverDeleteVolume(volume *instance.VolumeServer, instanceAPI *instance.API
 	var err error
 
 	if volume.VolumeType == instance.VolumeServerVolumeTypeSbsVolume {
+		volumeAvailable := block.VolumeStatusAvailable
 		_, err = blockAPI.WaitForVolumeAndReferences(&block.WaitForVolumeAndReferencesRequest{
-			Zone:     volume.Zone,
-			VolumeID: volume.ID,
+			Zone:                 volume.Zone,
+			VolumeID:             volume.ID,
+			VolumeTerminalStatus: &volumeAvailable,
 		})
 		if err != nil {
 			return errorDeletingResource(err)