Skip to content

Commit

Permalink
fix vd_controller
Browse files Browse the repository at this point in the history 
Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
  • Loading branch information
@LopatinDmitr
LopatinDmitr committed Oct 22, 2024
1 parent 0d7148a commit d3bbaf6
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 49 deletions.
19 changes: 9 additions & 10 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo
return false, err
}

clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
return false, err
}
sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
return false, err
}

switch {
case isDiskProvisioningFinished(condition):
log.Debug("Disk provisioning finished: clean up")
Expand Down Expand Up @@ -103,16 +112,6 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo

source := ds.getSource()

clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
return false, err
}

sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
return false, err
}

err = ds.diskService.Start(ctx, diskSize, sc, source, vd, supgen)

if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
Expand Down
1 change: 0 additions & 1 deletion images/virtualization-artifact/pkg/controller/vd/internal/source/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
return false, err
}

sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
return false, err
Expand Down
19 changes: 9 additions & 10 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
return false, err
}

clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
return false, err
}
sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
return false, err
}

switch {
case isDiskProvisioningFinished(condition):
log.Debug("Disk provisioning finished: clean up")
Expand Down Expand Up @@ -165,16 +174,6 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
return false, err
}

clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
return false, err
}

sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
return false, err
}

err = ds.diskService.Start(ctx, diskSize, sc, source, vd, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
return false, err
Expand Down
19 changes: 9 additions & 10 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref_vi_on_pvc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,15 @@ func (ds ObjectRefVirtualImageOnPvc) Sync(ctx context.Context, vd *virtv2.Virtua
return false, err
}

clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
if updated, err := setConditionFromStorageClassError(err, vd, condition); err != nil || updated {
return false, err
}
sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setConditionFromStorageClassError(err, vd, condition); err != nil || updated {
return false, err
}

switch {
case isDiskProvisioningFinished(*condition):
log.Info("Disk provisioning finished: clean up")
Expand Down Expand Up @@ -103,16 +112,6 @@ func (ds ObjectRefVirtualImageOnPvc) Sync(ctx context.Context, vd *virtv2.Virtua
},
}

clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
if updated, err := setPhaseConditionFromStorageError(err, vd, condition); err != nil || updated {
return false, err
}

sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setPhaseConditionFromStorageError(err, vd, condition); err != nil || updated {
return false, err
}

err = ds.diskService.Start(ctx, size, sc, source, vd, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vd, condition); err != nil || updated {
return false, err
Expand Down
18 changes: 9 additions & 9 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,15 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
return false, err
}

clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
return false, err
}
sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
return false, err
}

switch {
case isDiskProvisioningFinished(condition):
log.Debug("Disk provisioning finished: clean up")
Expand Down Expand Up @@ -203,15 +212,6 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
}

source := ds.getSource(supgen, ds.statService.GetDVCRImageName(pod))
clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
return false, err
}

sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
return false, err
}

err = ds.diskService.Start(ctx, diskSize, sc, source, vd, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
Expand Down
18 changes: 9 additions & 9 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
return false, err
}

clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
return false, err
}
sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
return false, err
}

switch {
case isDiskProvisioningFinished(condition):
log.Debug("Disk provisioning finished: clean up")
Expand Down Expand Up @@ -229,15 +238,6 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
}

source := ds.getSource(supgen, ds.statService.GetDVCRImageName(pod))
clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
return false, err
}

sc, err := ds.storageClassService.GetStorageClass(vd.Spec.PersistentVolumeClaim.StorageClass, clusterDefaultSC.Name)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
return false, err
}

err = ds.diskService.Start(ctx, diskSize, sc, source, vd, supgen)
if updated, err := setPhaseConditionFromStorageError(err, vd, &condition); err != nil || updated {
Expand Down

0 comments on commit d3bbaf6

Please sign in to comment.