Skip to content

fix(api): make user-facing condition messages clearer #2558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
fl64 wants to merge 25 commits into
base: main
Choose a base branch
from
Draft

fix(api): make user-facing condition messages clearer #2558

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7ad7e89
fix(vm): make condition messages user-friendly
fl64 Jun 30, 2026
897d126
fix(vmbda): make condition messages user-friendly
fl64 Jun 30, 2026
5574240
fix(vd): make condition messages user-friendly
fl64 Jun 30, 2026
2a0055d
fix(vi): make condition messages user-friendly
fl64 Jun 30, 2026
5c66cdb
fix(cvi): make condition messages user-friendly
fl64 Jun 30, 2026
3f2aeae
fix(vdsnapshot): fix grammar in condition messages
fl64 Jun 30, 2026
78fb85e
fix(vmsnapshot): fix grammar in condition messages
fl64 Jun 30, 2026
48f8f26
fix(vmbda): say the VirtualMachine is not running
fl64 Jun 30, 2026
5f564fa
fix(vmbda): keep the node name in the storage-availability message
fl64 Jun 30, 2026
9477ff3
fix(vi, cvi): unify image provisioning and image-lost wording
fl64 Jun 30, 2026
daf7219
fix(vd, vi, cvi, vmbda): make storage wording consistent
fl64 Jun 30, 2026
e800d8c
fix(vi): name the PersistentVolumeClaim in the bind-wait message
fl64 Jun 30, 2026
d150ba0
fix(vm, vd, vi, cvi): align wording across condition messages
fl64 Jun 30, 2026
4987f69
fix(vmbda): do not report a missing volume as not-ready
fl64 Jun 30, 2026
df27e99
fix(vm): add trailing period to provisioning condition messages
fl64 Jun 30, 2026
86d877d
fix(vm, vmclass, vmop, vdsnapshot): clean up condition message text
fl64 Jun 30, 2026
21165d1
fix(vd, vi, vdsnapshot): keep the lost object name in the message
fl64 Jun 30, 2026
1de05f8
fix(vmop): describe migration progress accurately, not as node moves
fl64 Jun 30, 2026
eaeb367
fix(usb, vmsop, dvcr): make user-facing condition messages clearer
fl64 Jun 30, 2026
3db4cdf
fix(vi): describe the PersistentVolumeClaim being prepared, not 'imag…
fl64 Jun 30, 2026
ab6a0b1
fix(vmbda): don't report a running VM as 'not running' on transient i…
fl64 Jun 30, 2026
38f2f83
fix(vd, vi, vdsnapshot): address PR review comments on condition mess…
fl64 Jun 30, 2026
92afada
fix(vmsop): satisfy staticcheck ST1005 on the secret-nil error
fl64 Jun 30, 2026
594636b
fix(vm): give actionable guidance in agent and class condition messages
fl64 Jun 30, 2026
36a20e8
fix(vm): clarify why live migration is blocked, with applicable guidance
fl64 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion images/virtualization-artifact/pkg/controller/cvi/internal/image_presence.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (h *ImagePresenceHandler) Handle(ctx context.Context, cvi *v1alpha2.Cluster
Generation(cvi.Generation).
Status(metav1.ConditionFalse).
Reason(cvicondition.ImageLost).
Message(fmt.Sprintf("Image %q not found in DVCR.", registryURL))
Message("The image data is no longer available and needs to be recreated.")

conditions.SetCondition(cb, &cvi.Status.Conditions)
}
Expand Down
4 changes: 2 additions & 2 deletions images/virtualization-artifact/pkg/controller/cvi/internal/source/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, cvi *v1alpha2.ClusterVirtualI
cvi.Status.Phase = v1alpha2.ImageProvisioning
cb.Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("DVCR Provisioner not found: create the new one.")
Message("Preparing to import the image.")

log.Info("Create importer pod...", "progress", cvi.Status.Progress, "pod.phase", "nil")

Expand Down Expand Up @@ -207,7 +207,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, cvi *v1alpha2.ClusterVirtualI

cb.Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("Import is in the process of provisioning to DVCR.")
Message("The image is being imported.")

cvi.Status.Phase = v1alpha2.ImageProvisioning
cvi.Status.Progress = ds.statService.GetProgress(cvi.GetUID(), pod, cvi.Status.Progress)
Expand Down
6 changes: 3 additions & 3 deletions images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *v1alpha2.ClusterVir
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("DVCR Provisioner not found: create the new one.")
Message("Preparing to import the image.")

log.Info("Ready", "progress", cvi.Status.Progress, "pod.phase", "nil")

Expand Down Expand Up @@ -245,7 +245,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *v1alpha2.ClusterVir
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.ProvisioningFailed).
Message("Failed to get stats from non-ready datasource: waiting for the DataSource to be ready.")
Message("Waiting for the source data to become ready.")
return reconcile.Result{}, nil
}

Expand Down Expand Up @@ -283,7 +283,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *v1alpha2.ClusterVir
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("Import is in the process of provisioning to DVCR.")
Message("The image is being imported.")

cvi.Status.Phase = v1alpha2.ImageProvisioning
cvi.Status.Target.RegistryURL = ds.statService.GetDVCRImageName(pod)
Expand Down
4 changes: 2 additions & 2 deletions images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref_vd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func (ds ObjectRefVirtualDisk) Sync(ctx context.Context, cvi *v1alpha2.ClusterVi
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("DVCR Provisioner not found: create the new one.")
Message("Preparing to import the image.")

log.Info("Create importer pod...", "progress", cvi.Status.Progress, "pod.phase", "nil")

Expand Down Expand Up @@ -204,7 +204,7 @@ func (ds ObjectRefVirtualDisk) Sync(ctx context.Context, cvi *v1alpha2.ClusterVi
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("Import is in the process of provisioning to DVCR.")
Message("The image is being imported.")

cvi.Status.Phase = v1alpha2.ImageProvisioning
cvi.Status.Progress = ds.statService.GetProgress(cvi.GetUID(), pod, cvi.Status.Progress)
Expand Down
8 changes: 4 additions & 4 deletions images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref_vdsnapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func (ds ObjectRefVirtualDiskSnapshot) Sync(ctx context.Context, cvi *v1alpha2.C
cb.
Status(metav1.ConditionFalse).
Reason(vicondition.Provisioning).
Message("PVC has created: waiting to be Bound.")
Message("Restoring data from the snapshot. Waiting for the PersistentVolumeClaim to be Bound.")

cvi.Status.Progress = "0%"
cvi.Status.SourceUID = ptr.To(vs.UID)
Expand Down Expand Up @@ -226,7 +226,7 @@ func (ds ObjectRefVirtualDiskSnapshot) Sync(ctx context.Context, cvi *v1alpha2.C
cb.
Status(metav1.ConditionFalse).
Reason(vicondition.Provisioning).
Message("DVCR Provisioner not found: create the new one.")
Message("Preparing to import the image.")

log.Info("Create importer pod...", "progress", cvi.Status.Progress, "pod.phase", "nil")

Expand Down Expand Up @@ -274,7 +274,7 @@ func (ds ObjectRefVirtualDiskSnapshot) Sync(ctx context.Context, cvi *v1alpha2.C
cb.
Status(metav1.ConditionFalse).
Reason(vicondition.Provisioning).
Message("Waiting for PVC to be bound")
Message("Restoring data from the snapshot. Waiting for the PersistentVolumeClaim to be Bound.")

return reconcile.Result{RequeueAfter: time.Second}, nil
}
Expand Down Expand Up @@ -304,7 +304,7 @@ func (ds ObjectRefVirtualDiskSnapshot) Sync(ctx context.Context, cvi *v1alpha2.C
cb.
Status(metav1.ConditionFalse).
Reason(vicondition.Provisioning).
Message("Import is in the process of provisioning to DVCR.")
Message("The image is being imported.")

cvi.Status.Phase = v1alpha2.ImageProvisioning
cvi.Status.Progress = ds.statService.GetProgress(cvi.GetUID(), pod, cvi.Status.Progress)
Expand Down
4 changes: 2 additions & 2 deletions images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref_vi_on_pvc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ func (ds ObjectRefVirtualImageOnPvc) Sync(ctx context.Context, cvi *v1alpha2.Clu
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("DVCR Provisioner not found: create the new one.")
Message("Preparing to import the image.")

log.Info("Create importer pod...", "progress", cvi.Status.Progress, "pod.phase", "nil")

Expand Down Expand Up @@ -193,7 +193,7 @@ func (ds ObjectRefVirtualImageOnPvc) Sync(ctx context.Context, cvi *v1alpha2.Clu
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("Import is in the process of provisioning to DVCR.")
Message("The image is being imported.")

cvi.Status.Phase = v1alpha2.ImageProvisioning
cvi.Status.Progress = ds.statService.GetProgress(cvi.GetUID(), pod, cvi.Status.Progress)
Expand Down
4 changes: 2 additions & 2 deletions images/virtualization-artifact/pkg/controller/cvi/internal/source/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, cvi *v1alpha2.ClusterVirt
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("DVCR Provisioner not found: create the new one.")
Message("Preparing to import the image.")

log.Info("Create importer pod...", "progress", cvi.Status.Progress, "pod.phase", "nil")

Expand Down Expand Up @@ -212,7 +212,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, cvi *v1alpha2.ClusterVirt
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("Import is in the process of provisioning to DVCR.")
Message("The image is being imported.")

cvi.Status.Phase = v1alpha2.ImageProvisioning
cvi.Status.Progress = "0%"
Expand Down
6 changes: 3 additions & 3 deletions images/virtualization-artifact/pkg/controller/cvi/internal/source/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, cvi *v1alpha2.ClusterVirtua
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("DVCR Provisioner not found: create the new one.")
Message("Preparing to import the image.")

log.Info("Create uploader pod...", "progress", cvi.Status.Progress, "pod.phase", nil)

Expand Down Expand Up @@ -222,7 +222,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, cvi *v1alpha2.ClusterVirtua
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.Provisioning).
Message("Import is in the process of provisioning to DVCR.")
Message("The image is being imported.")

cvi.Status.Phase = v1alpha2.ImageProvisioning
cvi.Status.Progress = ds.statService.GetProgress(cvi.GetUID(), pod, cvi.Status.Progress)
Expand All @@ -239,7 +239,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, cvi *v1alpha2.ClusterVirtua
cb.
Status(metav1.ConditionFalse).
Reason(cvicondition.WaitForUserUpload).
Message("Waiting for the user upload.")
Message("Waiting for the user to upload image data.")

cvi.Status.Phase = v1alpha2.ImageWaitForUserUpload
cvi.Status.Target.RegistryURL = ds.statService.GetDVCRImageName(pod)
Expand Down
2 changes: 1 addition & 1 deletion images/virtualization-artifact/pkg/controller/vd/internal/life_cycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vd *v1alpha2.VirtualDisk)
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.StorageClassIsNotReady).
Message("Storage class is not ready.")
Message("The StorageClass is not ready.")
conditions.SetCondition(cb, &vd.Status.Conditions)

return reconcile.Result{}, nil
Expand Down
12 changes: 6 additions & 6 deletions images/virtualization-artifact/pkg/controller/vd/internal/migration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,13 +492,13 @@ func (h MigrationHandler) handleMigrateSync(ctx context.Context, vd *v1alpha2.Vi
Reason(vdcondition.MigratingWaitForTargetReadyReason)

if pvc == nil {
cb.Message("Target persistent volume claim is not found.")
cb.Message("The target PersistentVolumeClaim is not found.")
conditions.SetCondition(cb, &vd.Status.Conditions)
return nil
}

if pvc.Status.Phase == corev1.ClaimBound {
cb.Status(metav1.ConditionTrue).Reason(vdcondition.InProgress).Message("Target persistent volume claim is bound.")
cb.Status(metav1.ConditionTrue).Reason(vdcondition.InProgress).Message("The target PersistentVolumeClaim is Bound.")
conditions.SetCondition(cb, &vd.Status.Conditions)
return nil
}
Expand All @@ -509,7 +509,7 @@ func (h MigrationHandler) handleMigrateSync(ctx context.Context, vd *v1alpha2.Vi
storageClassName = *sc
}
if storageClassName == "" {
cb.Message("Target persistent volume claim is pending.")
cb.Message("The target PersistentVolumeClaim is pending.")
conditions.SetCondition(cb, &vd.Status.Conditions)
return nil
}
Expand All @@ -518,7 +518,7 @@ func (h MigrationHandler) handleMigrateSync(ctx context.Context, vd *v1alpha2.Vi
err = h.client.Get(ctx, types.NamespacedName{Name: storageClassName}, sc)
if err != nil {
if k8serrors.IsNotFound(err) {
cb.Message("Target persistent volume claim is pending, StorageClass is not found.")
cb.Message("The target PersistentVolumeClaim is pending; the StorageClass is not found.")
conditions.SetCondition(cb, &vd.Status.Conditions)
return nil
}
Expand All @@ -527,13 +527,13 @@ func (h MigrationHandler) handleMigrateSync(ctx context.Context, vd *v1alpha2.Vi

isWaitForFistConsumer := sc.VolumeBindingMode == nil || *sc.VolumeBindingMode == storagev1.VolumeBindingWaitForFirstConsumer
if isWaitForFistConsumer {
cb.Status(metav1.ConditionTrue).Reason(vdcondition.InProgress).Message("Target persistent volume claim is waiting for first consumer.")
cb.Status(metav1.ConditionTrue).Reason(vdcondition.InProgress).Message("The target PersistentVolumeClaim is waiting for the first consumer.")
conditions.SetCondition(cb, &vd.Status.Conditions)
return nil
}
}

cb.Message("Target persistent volume claim is not bound or not waiting for first consumer.")
cb.Message("Waiting for the target PersistentVolumeClaim to be provisioned.")
conditions.SetCondition(cb, &vd.Status.Conditions)
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion images/virtualization-artifact/pkg/controller/vd/internal/resizing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func (h ResizingHandler) ResizeNeeded(
cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.ResizingNotAvailable).
Message("Disk resizing is not allowed: Storage class is not ready")
Message("Disk resizing is not allowed: the StorageClass is not ready.")
conditions.SetCondition(cb, &vd.Status.Conditions)
}

Expand Down
4 changes: 2 additions & 2 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk) (re
}

vd.Status.Phase = v1alpha2.DiskProvisioning
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "PVC Provisioner not found: create the new one.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Preparing the disk storage.")

return reconcile.Result{RequeueAfter: time.Second}, nil
case dvQuotaNotExceededCondition != nil && dvQuotaNotExceededCondition.Status == corev1.ConditionFalse:
Expand All @@ -279,7 +279,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk) (re
return reconcile.Result{}, nil
case pvc == nil:
vd.Status.Phase = v1alpha2.DiskProvisioning
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "PVC not found: waiting for creation.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Waiting for the PersistentVolumeClaim to be created.")
return reconcile.Result{RequeueAfter: time.Second}, nil
case ds.diskService.IsImportDone(dv, pvc):
log.Info("Import has completed", "dvProgress", dv.Status.Progress, "dvPhase", dv.Status.Phase, "pvcPhase", pvc.Status.Phase)
Expand Down
4 changes: 2 additions & 2 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
return reconcile.Result{}, err
}
vd.Status.Phase = v1alpha2.DiskProvisioning
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "PVC Provisioner not found: create the new one.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Preparing the disk storage.")

return reconcile.Result{RequeueAfter: time.Second}, nil
case dvQuotaNotExceededCondition != nil && dvQuotaNotExceededCondition.Status == corev1.ConditionFalse:
Expand All @@ -284,7 +284,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *v1alpha2.VirtualDisk)
return reconcile.Result{}, nil
case pvc == nil:
vd.Status.Phase = v1alpha2.DiskProvisioning
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "PVC not found: waiting for creation.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Waiting for the PersistentVolumeClaim to be created.")
return reconcile.Result{RequeueAfter: time.Second}, nil
case ds.diskService.IsImportDone(dv, pvc):
log.Info("Import has completed", "dvProgress", dv.Status.Progress, "dvPhase", dv.Status.Phase, "pvcPhase", pvc.Status.Phase)
Expand Down
14 changes: 7 additions & 7 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/sources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ func setPhaseConditionForFinishedDisk(
switch {
case pvc == nil:
newPhase = v1alpha2.DiskLost
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Lost, fmt.Sprintf("PVC %s not found.", supgen.PersistentVolumeClaim().String()))
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Lost, fmt.Sprintf("The underlying PersistentVolumeClaim %q was not found.", supgen.PersistentVolumeClaim().String()))
case pvc.Status.Phase == corev1.ClaimLost:
if pvc.GetAnnotations()[annotations.AnnDataExportRequest] == "true" {
newPhase = v1alpha2.DiskExporting
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Exporting, "PV is being exported")
Comment thread
prismagod marked this conversation as resolved.
Outdated
} else {
newPhase = v1alpha2.DiskLost
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Lost, fmt.Sprintf("PV %s not found.", pvc.Spec.VolumeName))
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Lost, fmt.Sprintf("The underlying PersistentVolume %q was not found.", pvc.Spec.VolumeName))
}
default:
newPhase = v1alpha2.DiskReady
Expand All @@ -144,7 +144,7 @@ func setPhaseConditionFromStorageError(err error, vd *v1alpha2.VirtualDisk, cb *
cb,
metav1.ConditionFalse,
vdcondition.ProvisioningFailed,
"StorageProfile not found in the cluster: Please check a StorageClass name in the cluster or set a default StorageClass.",
"The StorageClass is not fully configured in the cluster. Check the StorageClass name or set a default StorageClass.",
)
return true, nil
case errors.Is(err, service.ErrDefaultStorageClassNotFound):
Expand Down Expand Up @@ -176,7 +176,7 @@ func setPhaseConditionForPVCProvisioningDisk(
case err == nil:
if dv == nil {
vd.Status.Phase = v1alpha2.DiskProvisioning
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Waiting for the pvc importer to be created")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Waiting for the disk provisioning to start.")
return nil
}

Expand All @@ -191,7 +191,7 @@ func setPhaseConditionForPVCProvisioningDisk(
}

vd.Status.Phase = v1alpha2.DiskProvisioning
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Import is in the process of provisioning to PVC.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Importing data into the PersistentVolumeClaim.")
return nil
case errors.Is(err, service.ErrDataVolumeNotRunning):
vd.Status.Phase = v1alpha2.DiskFailed
Expand Down Expand Up @@ -333,9 +333,9 @@ func setPhaseConditionFromProvisioningError(
return err
}

setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "PVC provisioner recreation due to a changes in the virtual machine tolerations.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Recreating the disk provisioner due to changes in the virtual machine tolerations.")
} else {
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Trying to schedule the PVC provisioner.")
setReadyConditionWithWFFCAccounting(vd, cb, metav1.ConditionFalse, vdcondition.Provisioning, "Scheduling the disk provisioner.")
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion images/virtualization-artifact/pkg/controller/vd/internal/source/step/create_dv_step.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (s CreateDataVolumeStep) Take(ctx context.Context, vd *v1alpha2.VirtualDisk
s.cb.
Status(metav1.ConditionFalse).
Reason(vicondition.ProvisioningFailed).
Message("StorageProfile not found in the cluster: Please check a StorageProfile name in the cluster.")
Message("The StorageClass is not fully configured in the cluster. Check the StorageClass name or set a default StorageClass.")
return &reconcile.Result{}, nil
default:
return nil, fmt.Errorf("start immediate: %w", err)
Expand Down
2 changes: 1 addition & 1 deletion ...zation-artifact/pkg/controller/vd/internal/source/step/create_pvc_from_vdsnapshot_step.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func (s CreatePVCFromVDSnapshotStep) Take(ctx context.Context, vd *v1alpha2.Virt
s.cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("PVC has created: waiting to be Bound.")
Message("The PersistentVolumeClaim has been created; waiting for it to be Bound.")

vd.Status.Progress = "0%"
vd.Status.SourceUID = ptr.To(vdSnapshot.UID)
Expand Down
4 changes: 2 additions & 2 deletions ...s/virtualization-artifact/pkg/controller/vd/internal/source/step/ensure_node_placement.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (s EnsureNodePlacementStep) Take(ctx context.Context, vd *v1alpha2.VirtualD
s.cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("Trying to schedule the PersistentVolumeClaim provisioner.")
Message("Scheduling the disk provisioner.")
return &reconcile.Result{}, nil
}

Expand All @@ -112,6 +112,6 @@ func (s EnsureNodePlacementStep) Take(ctx context.Context, vd *v1alpha2.VirtualD
s.cb.
Status(metav1.ConditionFalse).
Reason(vdcondition.Provisioning).
Message("The PersistentVolumeClaim provisioner will be recreated due to changes in the virtual machine tolerations.")
Message("The disk provisioner will be recreated due to changes in the virtual machine tolerations.")
return &reconcile.Result{}, nil
}
2 changes: 1 addition & 1 deletion images/virtualization-artifact/pkg/controller/vd/internal/source/step/ready_step.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (s ReadyStep) Take(ctx context.Context, vd *v1alpha2.VirtualDisk) (*reconci
s.cb.Status(metav1.ConditionFalse)
if s.pvc.GetAnnotations()[annotations.AnnDataExportRequest] == "true" {
vd.Status.Phase = v1alpha2.DiskExporting
s.cb.Reason(vdcondition.Exporting).Message("PV is being exported")
s.cb.Reason(vdcondition.Exporting).Message("The PersistentVolume is being exported.")
} else {
vd.Status.Phase = v1alpha2.DiskLost
s.cb.
Expand Down
Loading
Loading