Skip to content

Commit aa7ac1a

Browse files
committed
list files
Signed-off-by: Daniil Antoshin <[email protected]>
1 parent 6c5fa41 commit aa7ac1a

File tree

4 files changed

+24
-4
lines changed

4 files changed

+24
-4
lines changed

images/dvcr-artifact/pkg/datasource/filesystem-datasource.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"fmt"
2121
"io"
2222
"os"
23+
"time"
2324

2425
"github.com/google/uuid"
2526
)
@@ -33,6 +34,24 @@ type FilesystemDataSource struct {
3334
func NewFilesystemDataSource() (*FilesystemDataSource, error) {
3435
filesystemImagePath := "/tmp/fs/disk.img"
3536

37+
files, err := os.ReadDir("/tmp/fs")
38+
if err != nil {
39+
return nil, fmt.Errorf("can not read directory /tmp/fs: %w", err)
40+
}
41+
42+
for _, file := range files {
43+
if file.IsDir() {
44+
continue
45+
}
46+
filesystemImagePath = file.Name()
47+
fmt.Printf("filesystemImagePath: %s\n", filesystemImagePath)
48+
break
49+
}
50+
51+
for {
52+
time.Sleep(10 * time.Second)
53+
}
54+
3655
file, err := os.Open(filesystemImagePath)
3756
if err != nil {
3857
return nil, fmt.Errorf("can not get open image %s: %w", filesystemImagePath, err)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (ds ObjectRefVirtualDisk) Sync(ctx context.Context, cvi *v1alpha2.ClusterVi
112112
cvi.Status.Progress = ds.statService.GetProgress(cvi.GetUID(), pod, cvi.Status.Progress)
113113
cvi.Status.Target.RegistryURL = ds.statService.GetDVCRImageName(pod)
114114

115-
var pvc *corev1.PersistentVolumeClaim
115+
pvc := &corev1.PersistentVolumeClaim{}
116116
err := ds.client.Get(ctx, types.NamespacedName{Name: vdRef.Status.Target.PersistentVolumeClaim, Namespace: vdRef.Namespace}, pvc)
117117
if err != nil {
118118
return reconcile.Result{}, err

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,14 @@ func (ds ObjectRefVirtualDisk) StoreToDVCR(ctx context.Context, vi *v1alpha2.Vir
114114
vi.Status.Progress = ds.statService.GetProgress(vi.GetUID(), pod, vi.Status.Progress)
115115
vi.Status.Target.RegistryURL = ds.statService.GetDVCRImageName(pod)
116116

117-
pvc, err := ds.diskService.GetPersistentVolumeClaim(ctx, supgen)
117+
pvc := &corev1.PersistentVolumeClaim{}
118+
err := ds.client.Get(ctx, types.NamespacedName{Name: vdRef.Status.Target.PersistentVolumeClaim, Namespace: vdRef.Namespace}, pvc)
118119
if err != nil {
119120
return reconcile.Result{}, err
120121
}
121122

122123
var envSettings *importer.Settings
123-
if pvc.Spec.VolumeMode != nil {
124+
if pvc != nil && pvc.Spec.VolumeMode != nil {
124125
envSettings = ds.getEnvSettings(vi, supgen, pvc.Spec.VolumeMode)
125126
} else {
126127
envSettings = ds.getEnvSettings(vi, supgen, ptr.To(corev1.PersistentVolumeBlock))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (s CreatePodStep) Take(ctx context.Context, vi *v1alpha2.VirtualImage) (*re
9393
podSettings := s.importer.GetPodSettingsWithPVC(ownerRef, supgen, pvcKey.Name, pvcKey.Namespace)
9494

9595
var envSettings *importer.Settings
96-
if s.pvc.Spec.VolumeMode != nil {
96+
if s.pvc != nil && s.pvc.Spec.VolumeMode != nil {
9797
envSettings = s.getEnvSettings(vi, supgen, s.pvc.Spec.VolumeMode)
9898
} else {
9999
envSettings = s.getEnvSettings(vi, supgen, ptr.To(corev1.PersistentVolumeBlock))

0 commit comments

Comments
 (0)