Skip to content

Commit d00f154

Browse files
author
Valeriy Khorunzhin
committed
test
Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>
1 parent c0c39f2 commit d00f154

4 files changed

Lines changed: 11 additions & 14 deletions

File tree

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

Lines changed: 5 additions & 5 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{}, fmt.Errorf("VI object ref source %s is nil", cvi.Spec.DataSource.ObjectRef.Name)
107+
return reconcile.Result{}, nil
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{}, fmt.Errorf("VD object ref source %s is nil", cvi.Spec.DataSource.ObjectRef.Name)
121+
return reconcile.Result{}, nil
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{}, fmt.Errorf("VDSnapshot object ref %s is nil", vdSnapshotKey)
134+
return reconcile.Result{}, nil
135135
}
136136

137137
return ds.vdSnapshotSyncer.Sync(ctx, cvi, vdSnapshot, cb)
@@ -317,7 +317,7 @@ func (ds ObjectRefDataSource) CleanUp(ctx context.Context, cvi *virtv2.ClusterVi
317317

318318
func (ds ObjectRefDataSource) Validate(ctx context.Context, cvi *virtv2.ClusterVirtualImage) error {
319319
if cvi.Spec.DataSource.ObjectRef == nil {
320-
return fmt.Errorf("nil object ref: %s", cvi.Spec.DataSource.Type)
320+
return nil
321321
}
322322

323323
switch cvi.Spec.DataSource.ObjectRef.Kind {
@@ -368,7 +368,7 @@ func (ds ObjectRefDataSource) Validate(ctx context.Context, cvi *virtv2.ClusterV
368368
}
369369

370370
if vdSnapshot == nil {
371-
return fmt.Errorf("VDSnapshot object ref %s is nil", vdSnapshotKey)
371+
return NewVirtualDiskSnapshotNotReadyError(cvi.Spec.DataSource.ObjectRef.Name)
372372
}
373373

374374
return ds.vdSnapshotSyncer.Validate(ctx, cvi)

‎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{}, fmt.Errorf("VI object ref source %s is nil", vd.Spec.DataSource.ObjectRef.Name)
75+
return reconcile.Result{}, nil
7676
}
7777

7878
switch vi.Spec.Storage {

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

Lines changed: 5 additions & 5 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{}, fmt.Errorf("VI object ref %s is nil", viKey)
113+
return reconcile.Result{}, nil
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{}, fmt.Errorf("VD object ref %s is nil", vdKey)
127+
return reconcile.Result{}, nil
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{}, fmt.Errorf("VI object ref source %s is nil", vi.Spec.DataSource.ObjectRef.Name)
320+
return reconcile.Result{}, nil
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{}, fmt.Errorf("VD object ref %s is nil", viKey)
334+
return reconcile.Result{}, nil
335335
}
336336

337337
return ds.vdSyncer.StoreToDVCR(ctx, vi, vd, cb)
@@ -501,7 +501,7 @@ func (ds ObjectRefDataSource) Validate(ctx context.Context, vi *virtv2.VirtualIm
501501
}
502502

503503
if viRef == nil {
504-
return fmt.Errorf("VI object ref source %s is nil", vi.Spec.DataSource.ObjectRef.Name)
504+
return NewImageNotReadyError(vi.Spec.DataSource.ObjectRef.Name)
505505
}
506506

507507
if viRef.Spec.Storage == virtv2.StorageKubernetes || viRef.Spec.Storage == virtv2.StoragePersistentVolumeClaim {

‎tests/e2e/default_config.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ logFilter:
4242
- "Server rejected event (will not retry!)" # Msg.
4343
- "validation failed for data source objectref" # Err.
4444
- "clean up failed for data source registry" # Err.
45-
- "VDSnapshot object ref" # Err.
46-
- "VirtualDiskSnapshot " # Err.
47-
- "VI object ref source " # Err.
4845
- "error patching metadata: the server rejected our request due to an error in our request" # Err.
4946
- "failed to sync powerstate" # Msg.
5047
- "failed to sync virtual disk data source objectref" # "err": "failed to sync virtual disk data source objectref: admission webhook \"datavolume-validate.cdi.kubevirt.io\" denied the request: Destination PVC winwin/vd-win2022-8a136ef9-32d9-4ae3-a27f-e42e15c15f47 already exists"

0 commit comments

Comments
 (0)