fix vd_controller

Signed-off-by: dmitry.lopatin <dmitry.lopatin@flant.com>
deckhouse · Oct 22, 2024 · 84b586b · 84b586b
1 parent d3bbaf6
commit 84b586b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go
@@ -69,11 +69,11 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (boo
 	}
 
 	clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
-	if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
+	if updated, err := setConditionFromStorageClassError(err, &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 {
+	if updated, err := setConditionFromStorageClassError(err, &condition); err != nil || updated {
 		return false, err
 	}
 

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/http.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/http.go
@@ -86,11 +86,11 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bool
 	}
 
 	clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
-	if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
+	if updated, err := setConditionFromStorageClassError(err, &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 {
+	if updated, err := setConditionFromStorageClassError(err, &condition); err != nil || updated {
 		return false, err
 	}
 

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref.go
@@ -104,11 +104,11 @@ func (ds ObjectRefDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk)
 	}
 
 	clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
-	if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
+	if updated, err := setConditionFromStorageClassError(err, &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 {
+	if updated, err := setConditionFromStorageClassError(err, &condition); err != nil || updated {
 		return false, err
 	}
 

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref_vi_on_pvc.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref_vi_on_pvc.go
@@ -60,11 +60,11 @@ func (ds ObjectRefVirtualImageOnPvc) Sync(ctx context.Context, vd *virtv2.Virtua
 	}
 
 	clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
-	if updated, err := setConditionFromStorageClassError(err, vd, condition); err != nil || updated {
+	if updated, err := setConditionFromStorageClassError(err, 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 {
+	if updated, err := setConditionFromStorageClassError(err, condition); err != nil || updated {
 		return false, err
 	}
 

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/registry.go
@@ -92,11 +92,11 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
 	}
 
 	clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
-	if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
+	if updated, err := setConditionFromStorageClassError(err, &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 {
+	if updated, err := setConditionFromStorageClassError(err, &condition); err != nil || updated {
 		return false, err
 	}
 

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/sources.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/sources.go
@@ -127,7 +127,7 @@ type CheckImportProcess interface {
 	CheckImportProcess(ctx context.Context, dv *cdiv1.DataVolume, pvc *corev1.PersistentVolumeClaim) error
 }
 
-func setConditionFromStorageClassError(err error, vd *virtv2.VirtualDisk, condition *metav1.Condition) (bool, error) {
+func setConditionFromStorageClassError(err error, condition *metav1.Condition) (bool, error) {
 	switch {
 	case err == nil:
 		return false, nil

diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go b/images/virtualization-artifact/pkg/controller/vd/internal/source/upload.go
@@ -94,11 +94,11 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (bo
 	}
 
 	clusterDefaultSC, err := ds.diskService.GetDefaultStorageClass(ctx)
-	if updated, err := setConditionFromStorageClassError(err, vd, &condition); err != nil || updated {
+	if updated, err := setConditionFromStorageClassError(err, &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 {
+	if updated, err := setConditionFromStorageClassError(err, &condition); err != nil || updated {
 		return false, err
 	}