actuator: cleanup cloudinit and ignition volume on error

openshift · Jun 18, 2021 · 54ecd7f · 54ecd7f
1 parent 2b56adc
commit 54ecd7f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/cloud/libvirt/actuators/machine/actuator.go b/pkg/cloud/libvirt/actuators/machine/actuator.go
@@ -284,6 +284,12 @@ func (a *Actuator) createVolumeAndDomain(ctx context.Context, machine *machinev1
 		if err := client.DeleteVolume(domainName); err != nil {
 			glog.Errorf("Error cleaning up volume: %v", err)
 		}
+		if err := client.DeleteVolume(cloudInitVolumeName(domainName)); err != nil {
+			glog.Errorf("Error cleaning up cloud-init volume: %v", err)
+		}
+		if err := client.DeleteVolume(ignitionVolumeName(domainName)); err != nil {
+			glog.Errorf("Error cleaning up ignition volume: %v", err)
+		}
 
 		return nil, a.handleMachineError(machine, apierrors.CreateMachine("error creating domain %v", err), createEventAction)
 	}