diff --git a/images/virtualization-artifact/pkg/controller/service/attachment_service.go b/images/virtualization-artifact/pkg/controller/service/attachment_service.go index 731ba8269d..39c3b08f20 100644 --- a/images/virtualization-artifact/pkg/controller/service/attachment_service.go +++ b/images/virtualization-artifact/pkg/controller/service/attachment_service.go @@ -50,10 +50,9 @@ func NewAttachmentService(client Client, virtClient kubeclient.Client, controlle } var ( - ErrVolumeStatusNotReady = errors.New("hotplug is not ready") - ErrBlockDeviceIsSpecAttached = errors.New("block device is already attached to the virtual machine spec") - ErrHotPlugRequestAlreadySent = errors.New("attachment request is already sent") - ErrVirtualMachineWaitsForRestartApproval = errors.New("virtual machine waits for restart approval") + ErrVolumeStatusNotReady = errors.New("hotplug is not ready") + ErrBlockDeviceIsSpecAttached = errors.New("block device is already attached to the virtual machine spec") + ErrHotPlugRequestAlreadySent = errors.New("attachment request is already sent") ) func (s AttachmentService) IsHotPlugged(ad *AttachmentDisk, vm *virtv2.VirtualMachine, kvvmi *virtv1.VirtualMachineInstance) (bool, error) { @@ -125,10 +124,6 @@ func (s AttachmentService) CanHotPlug(ad *AttachmentDisk, vm *virtv2.VirtualMach } } - if len(vm.Status.RestartAwaitingChanges) > 0 { - return false, ErrVirtualMachineWaitsForRestartApproval - } - return true, nil } diff --git a/images/virtualization-artifact/pkg/controller/vmbda/internal/life_cycle.go b/images/virtualization-artifact/pkg/controller/vmbda/internal/life_cycle.go index ad81543eb1..1776b408d1 100644 --- a/images/virtualization-artifact/pkg/controller/vmbda/internal/life_cycle.go +++ b/images/virtualization-artifact/pkg/controller/vmbda/internal/life_cycle.go @@ -254,15 +254,6 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vmbda *virtv2.VirtualMachi Reason(vmbdacondition.AttachmentRequestSent). Message("Attachment request sent: attachment is in progress.") return reconcile.Result{}, nil - case errors.Is(err, service.ErrVirtualMachineWaitsForRestartApproval): - log.Info("Virtual machine waits for restart approval") - - vmbda.Status.Phase = virtv2.BlockDeviceAttachmentPhasePending - cb. - Status(metav1.ConditionFalse). - Reason(vmbdacondition.NotAttached). - Message(service.CapitalizeFirstLetter(err.Error())) - return reconcile.Result{}, nil case blockDeviceLimitCondition.Status != metav1.ConditionTrue: log.Info("Virtual machine block device capacity reached")