fix panic

Signed-off-by: yaroslavborbat <[email protected]>
deckhouse · Jul 17, 2024 · 2b4283f · 2b4283f
1 parent 0d4d8bb
commit 2b4283f
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go
@@ -116,6 +116,12 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo
 
 		vd.Status.Progress = "0%"
 
+		return true, nil
+	case pvc == nil:
+		vd.Status.Phase = virtv2.DiskProvisioning
+		condition.Status = metav1.ConditionFalse
+		condition.Reason = vdcondition.Provisioning
+		condition.Message = "PVC not found: waiting for creation."
 		return true, nil
 	case ds.diskService.IsImportDone(dv, pvc):
 		logger.Info("Import has completed", "dvProgress", dv.Status.Progress, "dvPhase", dv.Status.Phase, "pvcPhase", pvc.Status.Phase)

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/http.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/http.go
@@ -205,6 +205,12 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
 		vd.Status.Progress = "50%"
 		vd.Status.DownloadSpeed = ds.statService.GetDownloadSpeed(vd.GetUID(), pod)
 
+		return true, nil
+	case pvc == nil:
+		vd.Status.Phase = virtv2.DiskProvisioning
+		condition.Status = metav1.ConditionFalse
+		condition.Reason = vdcondition.Provisioning
+		condition.Message = "PVC not found: waiting for creation."
 		return true, nil
 	case ds.diskService.IsImportDone(dv, pvc):
 		logger.Info("Import has completed", "dvProgress", dv.Status.Progress, "dvPhase", dv.Status.Phase, "pvcPhase", pvc.Status.Phase)

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go
@@ -144,6 +144,12 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
 		vd.Status.Progress = "0%"
 		vd.Status.SourceUID = util.GetPointer(dvcrDataSource.GetUID())
 
+		return true, nil
+	case pvc == nil:
+		vd.Status.Phase = virtv2.DiskProvisioning
+		condition.Status = metav1.ConditionFalse
+		condition.Reason = vdcondition.Provisioning
+		condition.Message = "PVC not found: waiting for creation."
 		return true, nil
 	case ds.diskService.IsImportDone(dv, pvc):
 		logger.Info("Import has completed", "dvProgress", dv.Status.Progress, "dvPhase", dv.Status.Phase, "pvcPhase", pvc.Status.Phase)

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go
@@ -209,6 +209,12 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
 
 		vd.Status.Progress = "50%"
 
+		return true, nil
+	case pvc == nil:
+		vd.Status.Phase = virtv2.DiskProvisioning
+		condition.Status = metav1.ConditionFalse
+		condition.Reason = vdcondition.Provisioning
+		condition.Message = "PVC not found: waiting for creation."
 		return true, nil
 	case ds.diskService.IsImportDone(dv, pvc):
 		logger.Info("Import has completed", "dvProgress", dv.Status.Progress, "dvPhase", dv.Status.Phase, "pvcPhase", pvc.Status.Phase)

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go
@@ -230,6 +230,12 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 		vd.Status.Progress = "50%"
 		vd.Status.DownloadSpeed = ds.statService.GetDownloadSpeed(vd.GetUID(), pod)
 
+		return true, nil
+	case pvc == nil:
+		vd.Status.Phase = virtv2.DiskProvisioning
+		condition.Status = metav1.ConditionFalse
+		condition.Reason = vdcondition.Provisioning
+		condition.Message = "PVC not found: waiting for creation."
 		return true, nil
 	case ds.diskService.IsImportDone(dv, pvc):
 		logger.Info("Import has completed", "dvProgress", dv.Status.Progress, "dvPhase", dv.Status.Phase, "pvcPhase", pvc.Status.Phase)