Move the kubevirt api to core/api

Signed-off-by: Roman Mohr <[email protected]>
attlee-wang · Oct 25, 2021 · ac41c25 · ac41c25
1 parent 901f705
commit ac41c25
Show file tree

Hide file tree

Showing 432 changed files with 1,544 additions and 1,565 deletions.
diff --git a/cmd/example-cloudinit-hook-sidecar/cloudinit.go b/cmd/example-cloudinit-hook-sidecar/cloudinit.go
@@ -28,7 +28,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/log"
 	cloudinit "kubevirt.io/kubevirt/pkg/cloud-init"
 	hooks "kubevirt.io/kubevirt/pkg/hooks"

diff --git a/cmd/example-hook-sidecar/smbios.go b/cmd/example-hook-sidecar/smbios.go
@@ -30,7 +30,7 @@ import (
 	"github.com/spf13/pflag"
 	"google.golang.org/grpc"
 
-	vmSchema "kubevirt.io/client-go/api/v1"
+	vmSchema "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/log"
 	"kubevirt.io/kubevirt/pkg/hooks"
 	hooksInfo "kubevirt.io/kubevirt/pkg/hooks/info"

diff --git a/cmd/subresource-access-test/subresource-access-test.go b/cmd/subresource-access-test/subresource-access-test.go
@@ -26,7 +26,7 @@ import (
 
 	"k8s.io/client-go/rest"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/kubecli"
 )
 

diff --git a/cmd/virt-freezer/main.go b/cmd/virt-freezer/main.go
@@ -25,7 +25,7 @@ import (
 	"github.com/spf13/pflag"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/log"
 	cmdclient "kubevirt.io/kubevirt/pkg/virt-handler/cmd-client"
 )

diff --git a/cmd/virt-handler/virt-handler.go b/cmd/virt-handler/virt-handler.go
@@ -55,7 +55,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/kubecli"
 	"kubevirt.io/client-go/log"
 	clientutil "kubevirt.io/client-go/util"

diff --git a/cmd/virt-launcher/virt-launcher.go b/cmd/virt-launcher/virt-launcher.go
@@ -42,7 +42,7 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/util/retry"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/log"
 	cloudinit "kubevirt.io/kubevirt/pkg/cloud-init"
 	"kubevirt.io/kubevirt/pkg/config"

diff --git a/pkg/certificates/bootstrap/cert-manager_test.go b/pkg/certificates/bootstrap/cert-manager_test.go
@@ -13,7 +13,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/tools/cache"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/kubevirt/pkg/certificates/triple"
 	"kubevirt.io/kubevirt/pkg/certificates/triple/cert"
 )

diff --git a/pkg/cloud-init/cloud-init.go b/pkg/cloud-init/cloud-init.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"time"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/log"
 	"kubevirt.io/client-go/precond"
 	diskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"

diff --git a/pkg/cloud-init/cloud-init_test.go b/pkg/cloud-init/cloud-init_test.go
@@ -34,7 +34,7 @@ import (
 
 	k8sv1 "k8s.io/api/core/v1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 var _ = Describe("CloudInit", func() {

diff --git a/pkg/config/config-map.go b/pkg/config/config-map.go
@@ -22,7 +22,7 @@ package config
 import (
 	"path/filepath"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	ephemeraldiskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
 )
 

diff --git a/pkg/config/config-map_test.go b/pkg/config/config-map_test.go
@@ -28,7 +28,7 @@ import (
 	. "github.com/onsi/gomega"
 	k8sv1 "k8s.io/api/core/v1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 var _ = Describe("ConfigMap", func() {

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -27,7 +27,7 @@ import (
 
 	"kubevirt.io/kubevirt/pkg/util"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 type (

diff --git a/pkg/config/downwardapi.go b/pkg/config/downwardapi.go
@@ -22,7 +22,7 @@ package config
 import (
 	"path/filepath"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	ephemeraldiskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
 )
 

diff --git a/pkg/config/downwardapi_test.go b/pkg/config/downwardapi_test.go
@@ -29,7 +29,7 @@ import (
 
 	k8sv1 "k8s.io/api/core/v1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 var _ = Describe("DownwardAPI", func() {

diff --git a/pkg/config/secret.go b/pkg/config/secret.go
@@ -22,7 +22,7 @@ package config
 import (
 	"path/filepath"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	ephemeraldiskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
 )
 

diff --git a/pkg/config/secret_test.go b/pkg/config/secret_test.go
@@ -27,7 +27,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 var _ = Describe("Secret", func() {

diff --git a/pkg/config/service-account.go b/pkg/config/service-account.go
@@ -22,7 +22,7 @@ package config
 import (
 	"path/filepath"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	ephemeraldiskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
 )
 

diff --git a/pkg/config/service-account_test.go b/pkg/config/service-account_test.go
@@ -27,7 +27,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 var _ = Describe("ServiceAccount", func() {

diff --git a/pkg/config/sysprep.go b/pkg/config/sysprep.go
@@ -25,7 +25,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	ephemeraldiskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
 )
 

diff --git a/pkg/config/sysprep_test.go b/pkg/config/sysprep_test.go
@@ -28,7 +28,7 @@ import (
 	. "github.com/onsi/gomega"
 	k8sv1 "k8s.io/api/core/v1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 func createFile(fullPath string) {

diff --git a/pkg/container-disk/container-disk.go b/pkg/container-disk/container-disk.go
@@ -35,7 +35,7 @@ import (
 
 	ephemeraldisk "kubevirt.io/kubevirt/pkg/ephemeral-disk"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	diskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
 	"kubevirt.io/kubevirt/pkg/util"
 )

diff --git a/pkg/container-disk/container-disk_test.go b/pkg/container-disk/container-disk_test.go
@@ -34,7 +34,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/types"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 var _ = Describe("ContainerDisk", func() {

diff --git a/pkg/controller/conditions.go b/pkg/controller/conditions.go
@@ -24,7 +24,7 @@ import (
 
 	cdiv1 "kubevirt.io/containerized-data-importer/pkg/apis/core/v1beta1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 type VirtualMachineConditionManager struct {

diff --git a/pkg/controller/conditions_test.go b/pkg/controller/conditions_test.go
@@ -24,7 +24,7 @@ import (
 
 	v12 "k8s.io/api/core/v1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 var _ = Describe("VirtualMachineInstance ConditionManager", func() {

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -35,7 +35,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/log"
 	cdiv1 "kubevirt.io/containerized-data-importer/pkg/apis/core/v1beta1"
 )

diff --git a/pkg/controller/controller_ref.go b/pkg/controller/controller_ref.go
@@ -22,7 +22,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	virtv1 "kubevirt.io/client-go/api/v1"
+	virtv1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 // GetControllerOf returns the controllerRef if controllee has a controller,

diff --git a/pkg/controller/controller_ref_manager.go b/pkg/controller/controller_ref_manager.go
@@ -32,7 +32,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 
-	virtv1 "kubevirt.io/client-go/api/v1"
+	virtv1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/kubecli"
 	"kubevirt.io/client-go/log"
 	cdiv1 "kubevirt.io/containerized-data-importer/pkg/apis/core/v1beta1"

diff --git a/pkg/controller/controller_ref_manager_test.go b/pkg/controller/controller_ref_manager_test.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 
-	virtv1 "kubevirt.io/client-go/api/v1"
+	virtv1 "kubevirt.io/client-go/apis/core/v1"
 	cdiv1 "kubevirt.io/containerized-data-importer/pkg/apis/core/v1beta1"
 )
 

diff --git a/pkg/controller/virtinformers.go b/pkg/controller/virtinformers.go
@@ -49,7 +49,7 @@ import (
 	apiregv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
 	aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
 
-	kubev1 "kubevirt.io/client-go/api/v1"
+	kubev1 "kubevirt.io/client-go/apis/core/v1"
 	flavorv1 "kubevirt.io/client-go/apis/flavor/v1alpha1"
 	snapshotv1 "kubevirt.io/client-go/apis/snapshot/v1alpha1"
 	"kubevirt.io/client-go/kubecli"

diff --git a/pkg/downwardmetrics/downwardmetrics.go b/pkg/downwardmetrics/downwardmetrics.go
@@ -4,7 +4,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/kubevirt/pkg/config"
 	"kubevirt.io/kubevirt/pkg/downwardmetrics/vhostmd"
 )

diff --git a/pkg/emptydisk/emptydisk.go b/pkg/emptydisk/emptydisk.go
@@ -6,7 +6,7 @@ import (
 	"path"
 	"strconv"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	ephemeraldiskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
 	"kubevirt.io/kubevirt/pkg/util"
 )

diff --git a/pkg/emptydisk/emptydisk_test.go b/pkg/emptydisk/emptydisk_test.go
@@ -10,7 +10,7 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/resource"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 var _ = Describe("EmptyDisk", func() {

diff --git a/pkg/ephemeral-disk/ephemeral-disk.go b/pkg/ephemeral-disk/ephemeral-disk.go
@@ -25,7 +25,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	diskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
 	"kubevirt.io/kubevirt/pkg/util"
 	"kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap/api"

diff --git a/pkg/ephemeral-disk/ephemeral-disk_test.go b/pkg/ephemeral-disk/ephemeral-disk_test.go
@@ -29,7 +29,7 @@ import (
 	. "github.com/onsi/gomega"
 	k8sv1 "k8s.io/api/core/v1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap/api"
 )
 

diff --git a/pkg/ephemeral-disk/fake/ephemeral-disk.go b/pkg/ephemeral-disk/fake/ephemeral-disk.go
@@ -3,7 +3,7 @@ package fake
 import (
 	"path/filepath"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap/api"
 )
 

diff --git a/pkg/flavor/flavor.go b/pkg/flavor/flavor.go
@@ -10,7 +10,7 @@ import (
 
 	k8sfield "k8s.io/apimachinery/pkg/util/validation/field"
 
-	virtv1 "kubevirt.io/client-go/api/v1"
+	virtv1 "kubevirt.io/client-go/apis/core/v1"
 	flavorv1alpha1 "kubevirt.io/client-go/apis/flavor/v1alpha1"
 )
 

diff --git a/pkg/flavor/flavor_test.go b/pkg/flavor/flavor_test.go
@@ -8,7 +8,7 @@ import (
 	k8sfield "k8s.io/apimachinery/pkg/util/validation/field"
 	"k8s.io/client-go/tools/cache"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	flavorv1alpha1 "kubevirt.io/client-go/apis/flavor/v1alpha1"
 	"kubevirt.io/kubevirt/pkg/flavor"
 	"kubevirt.io/kubevirt/pkg/testutils"

diff --git a/pkg/hooks/hooks.go b/pkg/hooks/hooks.go
@@ -24,7 +24,7 @@ import (
 
 	k8sv1 "k8s.io/api/core/v1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 const HookSidecarListAnnotationName = "hooks.kubevirt.io/hookSidecars"

diff --git a/pkg/hooks/hooks_test.go b/pkg/hooks/hooks_test.go
@@ -26,7 +26,7 @@ import (
 	. "github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/kubevirt/pkg/hooks"
 )
 

diff --git a/pkg/hooks/manager.go b/pkg/hooks/manager.go
@@ -31,7 +31,7 @@ import (
 	"sync"
 	"time"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/log"
 	cloudinit "kubevirt.io/kubevirt/pkg/cloud-init"
 	hooksInfo "kubevirt.io/kubevirt/pkg/hooks/info"

diff --git a/pkg/host-disk/host-disk.go b/pkg/host-disk/host-disk.go
@@ -32,7 +32,7 @@ import (
 	k8sv1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/record"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/kubevirt/pkg/util"
 	"kubevirt.io/kubevirt/pkg/util/types"
 )

diff --git a/pkg/host-disk/host-disk_test.go b/pkg/host-disk/host-disk_test.go
@@ -36,7 +36,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/record"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/kubecli"
 	"kubevirt.io/kubevirt/pkg/testutils"
 )

diff --git a/pkg/ignition/ignition.go b/pkg/ignition/ignition.go
@@ -23,7 +23,7 @@ import (
 	"errors"
 	"fmt"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 	"kubevirt.io/client-go/log"
 	"kubevirt.io/client-go/precond"
 	diskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"

diff --git a/pkg/ignition/ignition_test.go b/pkg/ignition/ignition_test.go
@@ -27,7 +27,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	v1 "kubevirt.io/client-go/api/v1"
+	v1 "kubevirt.io/client-go/apis/core/v1"
 )
 
 var _ = Describe("Ignition", func() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ import ( @@
     	"kubevirt.io/kubevirt/pkg/util"
-    	v1 "kubevirt.io/client-go/api/v1"
+    	v1 "kubevirt.io/client-go/apis/core/v1"
     )
     type (
@@ Expand Down @@