Skip to content

Commit f4f60b2

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

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
@@ -103,7 +103,7 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtu
103103
}
104104

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

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

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

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

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

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

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

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

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

373373
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
@@ -109,7 +109,7 @@ func (ds ObjectRefDataSource) StoreToPVC(ctx context.Context, vi *virtv2.Virtual
109109
}
110110

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

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

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

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

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

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

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

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

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

506506
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)