fix(vmcpu): resolved conflicts

Signed-off-by: Isteb4k <[email protected]>
deckhouse · Mar 21, 2024 · d79ce2a · d79ce2a
1 parent ae4b163
commit d79ce2a
Show file tree

Hide file tree

Showing 9 changed files with 246 additions and 17 deletions.
diff --git a/...ent/generated/clientset/versioned/typed/core/v1alpha2/fake/fake_virtualmachinecpumodel.go b/...ent/generated/clientset/versioned/typed/core/v1alpha2/fake/fake_virtualmachinecpumodel.go
diff --git a/api/client/generated/clientset/versioned/typed/core/v1alpha2/virtualmachinecpumodel.go b/api/client/generated/clientset/versioned/typed/core/v1alpha2/virtualmachinecpumodel.go
diff --git a/api/client/generated/informers/externalversions/core/v1alpha2/virtualmachinecpumodel.go b/api/client/generated/informers/externalversions/core/v1alpha2/virtualmachinecpumodel.go
diff --git a/api/client/generated/listers/core/v1alpha2/virtualmachinecpumodel.go b/api/client/generated/listers/core/v1alpha2/virtualmachinecpumodel.go
diff --git a/api/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go b/api/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go
diff --git a/images/virtualization-artifact/pkg/controller/cpu/cpu_controller.go b/images/virtualization-artifact/pkg/controller/cpu/cpu_controller.go
@@ -8,8 +8,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
-	"github.com/deckhouse/virtualization-controller/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization-controller/pkg/sdk/framework/two_phase_reconciler"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 const VMCPUControllerName = "vmcpu-controller"

diff --git a/images/virtualization-artifact/pkg/controller/cpu/cpu_reconciler.go b/images/virtualization-artifact/pkg/controller/cpu/cpu_reconciler.go
@@ -18,10 +18,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	virtv2 "github.com/deckhouse/virtualization-controller/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/common"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vmattachee"
 	"github.com/deckhouse/virtualization-controller/pkg/sdk/framework/two_phase_reconciler"
+	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 type VMCPUReconciler struct {

diff --git a/images/virtualization-artifact/pkg/controller/cpu/cpu_reconciler_state.go b/images/virtualization-artifact/pkg/controller/cpu/cpu_reconciler_state.go
@@ -11,9 +11,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	virtv2 "github.com/deckhouse/virtualization-controller/api/core/v1alpha2"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/vmattachee"
 	"github.com/deckhouse/virtualization-controller/pkg/sdk/framework/helper"
+	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 type VMCPUReconcilerState struct {

diff --git a/images/virtualization-artifact/pkg/controller/cpu/cpu_webhook.go b/images/virtualization-artifact/pkg/controller/cpu/cpu_webhook.go
@@ -10,7 +10,7 @@ import (
 	"k8s.io/utils/strings/slices"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	"github.com/deckhouse/virtualization-controller/api/core/v1alpha2"
+	"github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
 
 func NewVMCPUValidator(log logr.Logger) *VMCPUValidator {