Skip to content

Commit

Permalink
refactoring
Browse files Browse the repository at this point in the history 
Signed-off-by: Valeriy Khorunzhin <[email protected]>
  • Loading branch information
Valeriy Khorunzhin committed Jan 14, 2025
1 parent 2709d8c commit 2b1bf6d
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 44 deletions.
2 changes: 1 addition & 1 deletion images/virtualization-artifact/pkg/controller/vd/internal/source/blank.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (ds BlankDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (rec

var quotaNotExceededCondition *cdiv1.DataVolumeCondition
if dv != nil {
quotaNotExceededCondition = getDVNotExceededCondition(dv.Status.Conditions)
quotaNotExceededCondition = service.GetDataVolumeCondition(DVQoutaNotExceededConditionType, dv.Status.Conditions)
}

switch {
Expand Down
9 changes: 4 additions & 5 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import (
"github.com/deckhouse/virtualization-controller/pkg/dvcr"
"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
"github.com/deckhouse/virtualization-controller/pkg/logger"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
)
Expand Down Expand Up @@ -108,7 +107,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (reco

var quotaNotExceededCondition *cdiv1.DataVolumeCondition
if dv != nil {
quotaNotExceededCondition = getDVNotExceededCondition(dv.Status.Conditions)
quotaNotExceededCondition = service.GetDataVolumeCondition(DVQoutaNotExceededConditionType, dv.Status.Conditions)
}

switch {
Expand Down Expand Up @@ -141,7 +140,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (reco
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncStarted,
virtv2.ReasonDataSourceSyncStarted,
"The HTTP DataSource import to DVCR has started",
)

Expand Down Expand Up @@ -200,7 +199,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (reco
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncStarted,
virtv2.ReasonDataSourceSyncStarted,
"The HTTP DataSource import to PVC has started",
)

Expand Down Expand Up @@ -282,7 +281,7 @@ func (ds HTTPDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (reco
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncCompleted,
virtv2.ReasonDataSourceSyncCompleted,
"The HTTP DataSource import has completed",
)

Expand Down
7 changes: 3 additions & 4 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref_cvi.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
"github.com/deckhouse/virtualization-controller/pkg/controller/supplements"
"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
"github.com/deckhouse/virtualization-controller/pkg/logger"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
)
Expand Down Expand Up @@ -105,7 +104,7 @@ func (ds ObjectRefClusterVirtualImage) Sync(ctx context.Context, vd *virtv2.Virt

var quotaNotExceededCondition *cdiv1.DataVolumeCondition
if dv != nil {
quotaNotExceededCondition = getDVNotExceededCondition(dv.Status.Conditions)
quotaNotExceededCondition = service.GetDataVolumeCondition(DVQoutaNotExceededConditionType, dv.Status.Conditions)
}

switch {
Expand All @@ -132,7 +131,7 @@ func (ds ObjectRefClusterVirtualImage) Sync(ctx context.Context, vd *virtv2.Virt
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncStarted,
virtv2.ReasonDataSourceSyncStarted,
"The ObjectRef DataSource import to PVC has started",
)

Expand Down Expand Up @@ -196,7 +195,7 @@ func (ds ObjectRefClusterVirtualImage) Sync(ctx context.Context, vd *virtv2.Virt
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncCompleted,
virtv2.ReasonDataSourceSyncCompleted,
"The ObjectRef DataSource import has completed",
)

Expand Down
7 changes: 3 additions & 4 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref_vi_dvcr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import (
"github.com/deckhouse/virtualization-controller/pkg/controller/supplements"
"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
"github.com/deckhouse/virtualization-controller/pkg/logger"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
)
Expand Down Expand Up @@ -104,7 +103,7 @@ func (ds ObjectRefVirtualImageDVCR) Sync(ctx context.Context, vd *virtv2.Virtual

var quotaNotExceededCondition *cdiv1.DataVolumeCondition
if dv != nil {
quotaNotExceededCondition = getDVNotExceededCondition(dv.Status.Conditions)
quotaNotExceededCondition = service.GetDataVolumeCondition(DVQoutaNotExceededConditionType, dv.Status.Conditions)
}

switch {
Expand All @@ -131,7 +130,7 @@ func (ds ObjectRefVirtualImageDVCR) Sync(ctx context.Context, vd *virtv2.Virtual
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncStarted,
virtv2.ReasonDataSourceSyncStarted,
"The ObjectRef DataSource import to DVCR has started",
)

Expand Down Expand Up @@ -195,7 +194,7 @@ func (ds ObjectRefVirtualImageDVCR) Sync(ctx context.Context, vd *virtv2.Virtual
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncCompleted,
virtv2.ReasonDataSourceSyncCompleted,
"The ObjectRef DataSource import has completed",
)

Expand Down
7 changes: 3 additions & 4 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/object_ref_vi_pvc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import (
"github.com/deckhouse/virtualization-controller/pkg/controller/supplements"
"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
"github.com/deckhouse/virtualization-controller/pkg/logger"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
)
Expand Down Expand Up @@ -100,7 +99,7 @@ func (ds ObjectRefVirtualImagePVC) Sync(ctx context.Context, vd *virtv2.VirtualD

var quotaNotExceededCondition *cdiv1.DataVolumeCondition
if dv != nil {
quotaNotExceededCondition = getDVNotExceededCondition(dv.Status.Conditions)
quotaNotExceededCondition = service.GetDataVolumeCondition(DVQoutaNotExceededConditionType, dv.Status.Conditions)
}

switch {
Expand All @@ -127,7 +126,7 @@ func (ds ObjectRefVirtualImagePVC) Sync(ctx context.Context, vd *virtv2.VirtualD
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncStarted,
virtv2.ReasonDataSourceSyncStarted,
"The ObjectRef DataSource import to PVC has started",
)

Expand Down Expand Up @@ -196,7 +195,7 @@ func (ds ObjectRefVirtualImagePVC) Sync(ctx context.Context, vd *virtv2.VirtualD
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncCompleted,
virtv2.ReasonDataSourceSyncCompleted,
"The ObjectRef DataSource import has completed",
)

Expand Down
9 changes: 4 additions & 5 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 @@ -43,7 +43,6 @@ import (
"github.com/deckhouse/virtualization-controller/pkg/dvcr"
"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
"github.com/deckhouse/virtualization-controller/pkg/logger"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
)
Expand Down Expand Up @@ -109,7 +108,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (

var quotaNotExceededCondition *cdiv1.DataVolumeCondition
if dv != nil {
quotaNotExceededCondition = getDVNotExceededCondition(dv.Status.Conditions)
quotaNotExceededCondition = service.GetDataVolumeCondition(DVQoutaNotExceededConditionType, dv.Status.Conditions)
}

switch {
Expand Down Expand Up @@ -142,7 +141,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncStarted,
virtv2.ReasonDataSourceSyncStarted,
"The Registry DataSource import to DVCR has started",
)

Expand Down Expand Up @@ -200,7 +199,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncStarted,
virtv2.ReasonDataSourceSyncStarted,
"The Registry DataSource import to PVC has started",
)

Expand Down Expand Up @@ -280,7 +279,7 @@ func (ds RegistryDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncCompleted,
virtv2.ReasonDataSourceSyncCompleted,
"The Registry DataSource import has completed",
)

Expand Down
20 changes: 4 additions & 16 deletions images/virtualization-artifact/pkg/controller/vd/internal/source/sources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,11 +334,9 @@ func setPhaseConditionFromProvisioningError(

_, err = cleaner.CleanUp(ctx, supgen)
if err != nil {
if err != nil {
err = errors.Join(provisioningErr, err)
setPhaseConditionToFailed(cb, &vd.Status.Phase, err)
return err
}
err = errors.Join(provisioningErr, err)
setPhaseConditionToFailed(cb, &vd.Status.Phase, err)
return err
}

cb.
Expand Down Expand Up @@ -418,15 +416,5 @@ func setPhaseConditionToFailed(cb *conditions.ConditionBuilder, phase *virtv2.Di
}

const (
DVQoutaNotExceededConditionType string = "QuotaNotExceeded"
DVQoutaNotExceededConditionType cdiv1.DataVolumeConditionType = "QuotaNotExceeded"
)

func getDVNotExceededCondition(conditions []cdiv1.DataVolumeCondition) *cdiv1.DataVolumeCondition {
for _, condition := range conditions {
if string(condition.Type) == DVQoutaNotExceededConditionType {
return &condition
}
}

return nil
}
9 changes: 4 additions & 5 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 @@ -42,7 +42,6 @@ import (
"github.com/deckhouse/virtualization-controller/pkg/dvcr"
"github.com/deckhouse/virtualization-controller/pkg/eventrecord"
"github.com/deckhouse/virtualization-controller/pkg/logger"
"github.com/deckhouse/virtualization/api/core/v1alpha2"
virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
)
Expand Down Expand Up @@ -116,7 +115,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (re

var quotaNotExceededCondition *cdiv1.DataVolumeCondition
if dv != nil {
quotaNotExceededCondition = getDVNotExceededCondition(dv.Status.Conditions)
quotaNotExceededCondition = service.GetDataVolumeCondition(DVQoutaNotExceededConditionType, dv.Status.Conditions)
}

switch {
Expand Down Expand Up @@ -149,7 +148,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (re
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncStarted,
virtv2.ReasonDataSourceSyncStarted,
"The Upload DataSource import to DVCR has started",
)

Expand Down Expand Up @@ -234,7 +233,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (re
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncStarted,
virtv2.ReasonDataSourceSyncStarted,
"The Upload DataSource import to PVC has started",
)

Expand Down Expand Up @@ -309,7 +308,7 @@ func (ds UploadDataSource) Sync(ctx context.Context, vd *virtv2.VirtualDisk) (re
ds.recorder.Event(
vd,
corev1.EventTypeNormal,
v1alpha2.ReasonDataSourceSyncCompleted,
virtv2.ReasonDataSourceSyncCompleted,
"The Upload DataSource import has completed",
)

Expand Down

0 comments on commit 2b1bf6d

Please sign in to comment.