Skip to content

Commit 2e74db9

Browse files
author
Valeriy Khorunzhin
committed
fix
Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>
1 parent 2241646 commit 2e74db9

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

images/virtualization-artifact/pkg/controller/cvi/internal/source/object_ref.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtu
104104
}
105105

106106
if vi == nil {
107-
return reconcile.Result{}, nil
107+
return reconcile.Result{}, fmt.Errorf("VI object ref source %s is nil", cvi.Spec.DataSource.ObjectRef.Name)
108108
}
109109

110110
if vi.Spec.Storage == virtv2.StorageKubernetes || vi.Spec.Storage == virtv2.StoragePersistentVolumeClaim {
@@ -118,7 +118,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtu
118118
}
119119

120120
if vd == nil {
121-
return reconcile.Result{}, nil
121+
return reconcile.Result{}, fmt.Errorf("VD object ref source %s is nil", cvi.Spec.DataSource.ObjectRef.Name)
122122
}
123123

124124
return ds.vdSyncer.Sync(ctx, cvi, vd, cb)
@@ -131,7 +131,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtu
131131
}
132132

133133
if vdSnapshot == nil {
134-
return reconcile.Result{}, nil
134+
return reconcile.Result{}, fmt.Errorf("VDSnapshot object ref %s is nil", vdSnapshotKey)
135135
}
136136

137137
return ds.vdSnapshotSyncer.Sync(ctx, cvi, vdSnapshot, cb)

images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
7272
}
7373

7474
if vi == nil {
75-
return reconcile.Result{}, nil
75+
return reconcile.Result{}, fmt.Errorf("VI object ref source %s is nil", vd.Spec.DataSource.ObjectRef.Name)
7676
}
7777

7878
switch vi.Spec.Storage {

images/virtualization-artifact/pkg/controller/vi/internal/source/object_ref.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func (ds ObjectRefDataSource) StoreToPVC(ctx context.Context, vi *virtv2.Virtual
110110
}
111111

112112
if viRef == nil {
113-
return reconcile.Result{}, nil
113+
return reconcile.Result{}, fmt.Errorf("VI object ref %s is nil", viKey)
114114
}
115115

116116
if viRef.Spec.Storage == virtv2.StorageKubernetes || viRef.Spec.Storage == virtv2.StoragePersistentVolumeClaim {
@@ -124,7 +124,7 @@ func (ds ObjectRefDataSource) StoreToPVC(ctx context.Context, vi *virtv2.Virtual
124124
}
125125

126126
if vd == nil {
127-
return reconcile.Result{}, nil
127+
return reconcile.Result{}, fmt.Errorf("VD object ref %s is nil", vdKey)
128128
}
129129

130130
return ds.vdSyncer.StoreToPVC(ctx, vi, vd, cb)
@@ -317,7 +317,7 @@ func (ds ObjectRefDataSource) StoreToDVCR(ctx context.Context, vi *virtv2.Virtua
317317
}
318318

319319
if viRef == nil {
320-
return reconcile.Result{}, nil
320+
return reconcile.Result{}, fmt.Errorf("VI object ref source %s is nil", vi.Spec.DataSource.ObjectRef.Name)
321321
}
322322

323323
if viRef.Spec.Storage == virtv2.StorageKubernetes || viRef.Spec.Storage == virtv2.StoragePersistentVolumeClaim {
@@ -331,7 +331,7 @@ func (ds ObjectRefDataSource) StoreToDVCR(ctx context.Context, vi *virtv2.Virtua
331331
}
332332

333333
if vd == nil {
334-
return reconcile.Result{}, nil
334+
return reconcile.Result{}, fmt.Errorf("VD object ref %s is nil", viKey)
335335
}
336336

337337
return ds.vdSyncer.StoreToDVCR(ctx, vi, vd, cb)

0 commit comments

Comments
 (0)