feat(vi): apply new controller design

- fix linter errors Signed-off-by: Dmitry Lopatin <[email protected]>
deckhouse · Jun 20, 2024 · 17046e4 · 17046e4
1 parent 963db89
commit 17046e4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/images/virtualization-artifact/cmd/virtualization-controller/main.go b/images/virtualization-artifact/cmd/virtualization-controller/main.go
@@ -20,7 +20,6 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"github.com/deckhouse/virtualization-controller/pkg/controller/vi"
 	"os"
 	"runtime"
 	"strconv"
@@ -44,6 +43,7 @@ import (
 	"github.com/deckhouse/virtualization-controller/pkg/controller/cpu"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/cvi"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/ipam"
+	"github.com/deckhouse/virtualization-controller/pkg/controller/vi"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vmop"
 	virtv2alpha1 "github.com/deckhouse/virtualization/api/core/v1alpha2"
 )

diff --git a/images/virtualization-artifact/pkg/controller/vi/internal/source/http.go b/images/virtualization-artifact/pkg/controller/vi/internal/source/http.go
@@ -19,7 +19,6 @@ package source
 import (
 	"context"
 	"errors"
-
 	"log/slog"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/images/virtualization-artifact/pkg/controller/vi/internal/source/sources.go b/images/virtualization-artifact/pkg/controller/vi/internal/source/sources.go
@@ -18,12 +18,12 @@ package source
 
 import (
 	"context"
-	"github.com/deckhouse/virtualization/api/core/v1alpha2/vicondition"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	cc "github.com/deckhouse/virtualization-controller/pkg/controller/common"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2/vicondition"
 )
 
 type Handler interface {

diff --git a/images/virtualization-artifact/pkg/controller/vi/vi_reconciler.go b/images/virtualization-artifact/pkg/controller/vi/vi_reconciler.go
@@ -20,12 +20,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	corev1 "k8s.io/api/core/v1"
-	cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
 	"log/slog"
 	"time"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
+	cdiv1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/event"

diff --git a/images/virtualization-artifact/pkg/controller/vi/vi_webhook.go b/images/virtualization-artifact/pkg/controller/vi/vi_webhook.go
@@ -19,16 +19,16 @@ package vi
 import (
 	"context"
 	"fmt"
-	"github.com/deckhouse/virtualization-controller/pkg/common/vmi"
-	"github.com/deckhouse/virtualization/api/core/v1alpha2/vicondition"
 	"log/slog"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
+	"github.com/deckhouse/virtualization-controller/pkg/common/vmi"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/service"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2/vicondition"
 )
 
 type Validator struct {