change package import to resolve cherry-pick conflict

Signed-off-by: soer3n <[email protected]>

Author: soer3n

pkg/cloudprovider/provider/kubevirt/provider.go

@@ -35,11 +35,11 @@ import (
 	clusterv1alpha1 "k8c.io/machine-controller/pkg/apis/cluster/v1alpha1"
 	cloudprovidererrors "k8c.io/machine-controller/pkg/cloudprovider/errors"
 	"k8c.io/machine-controller/pkg/cloudprovider/instance"
-	kubevirttypes "k8c.io/machine-controller/pkg/cloudprovider/provider/kubevirt/types"
 	cloudprovidertypes "k8c.io/machine-controller/pkg/cloudprovider/types"
 	controllerutil "k8c.io/machine-controller/pkg/controller/util"
 	"k8c.io/machine-controller/pkg/providerconfig"
 	providerconfigtypes "k8c.io/machine-controller/pkg/providerconfig/types"
+	kubevirttypes "k8c.io/machine-controller/sdk/cloudprovider/kubevirt"
 
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
@@ -99,7 +99,7 @@ type Config struct {
 	DNSConfig                 *corev1.PodDNSConfig
 	DNSPolicy                 corev1.DNSPolicy
 	CPUs                      string
-	VCPUs                     *kubevirtcorev1.CPU
+	VCPUs                     *kubevirtv1.CPU
 	Resources                 *corev1.ResourceList
 	Memory                    string
 	Namespace                 string
@@ -856,7 +856,7 @@ func (p *provider) newVirtualMachine(c *Config, pc *providerconfigtypes.Config,
 	}
 
 	if c.VCPUs != nil {
-		virtualMachine.Spec.Template.Spec.Domain.CPU = &kubevirtcorev1.CPU{
+		virtualMachine.Spec.Template.Spec.Domain.CPU = &kubevirtv1.CPU{
 			Cores: c.VCPUs.Cores,
 		}
 	}
@@ -888,14 +888,14 @@ func (p *provider) Cleanup(ctx context.Context, _ *zap.SugaredLogger, machine *c
 	return false, sigClient.Delete(ctx, vm)
 }
 
-func parseResources(cpus, memory string, vpcus kubevirttypes.VCPUs) (*corev1.ResourceList, *kubevirtcorev1.CPU, error) {
+func parseResources(cpus, memory string, vpcus kubevirttypes.VCPUs) (*corev1.ResourceList, *kubevirtv1.CPU, error) {
 	memoryResource, err := resource.ParseQuantity(memory)
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to parse memory requests: %w", err)
 	}
 
 	if vpcus.Cores != 0 {
-		return &corev1.ResourceList{corev1.ResourceMemory: memoryResource}, &kubevirtcorev1.CPU{Cores: uint32(vpcus.Cores)}, nil
+		return &corev1.ResourceList{corev1.ResourceMemory: memoryResource}, &kubevirtv1.CPU{Cores: uint32(vpcus.Cores)}, nil
 	}
 
 	cpuResource, err := resource.ParseQuantity(cpus)

sdk/cloudprovider/kubevirt/types.go

@@ -19,8 +19,8 @@ package kubevirt
 import (
 	kubevirtcorev1 "kubevirt.io/api/core/v1"
 
-	"k8c.io/machine-controller/sdk/jsonutil"
-	"k8c.io/machine-controller/sdk/providerconfig"
+	"k8c.io/machine-controller/pkg/jsonutil"
+	providerconfig "k8c.io/machine-controller/pkg/providerconfig/types"
 
 	corev1 "k8s.io/api/core/v1"
 )