Reference updated for packages moved.

Signed-off-by: Kunal Kushwaha <[email protected]>
gilwoong-kang · Jun 19, 2019 · db76f4a · db76f4a
1 parent 0acbdb4
commit db76f4a
Show file tree

Hide file tree

Showing 384 changed files with 15,216 additions and 767 deletions.
diff --git a/cmd/example-cloudinit-hook-sidecar/BUILD.bazel b/cmd/example-cloudinit-hook-sidecar/BUILD.bazel
@@ -6,12 +6,12 @@ go_library(
     importpath = "kubevirt.io/kubevirt/cmd/example-cloudinit-hook-sidecar",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/cloud-init:go_default_library",
         "//pkg/hooks:go_default_library",
         "//pkg/hooks/info:go_default_library",
         "//pkg/hooks/v1alpha2:go_default_library",
-        "//pkg/log:go_default_library",
+        "//vendor/kubevirt.io/client-go/api/v1:go_default_library",
+        "//vendor/kubevirt.io/client-go/log:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
     ],
 )

diff --git a/cmd/example-cloudinit-hook-sidecar/cloudinit.go b/cmd/example-cloudinit-hook-sidecar/cloudinit.go
@@ -28,12 +28,12 @@ import (
 
 	"google.golang.org/grpc"
 
-	v1 "kubevirt.io/kubevirt/pkg/api/v1"
+	v1 "kubevirt.io/client-go/api/v1"
+	"kubevirt.io/client-go/log"
 	cloudinit "kubevirt.io/kubevirt/pkg/cloud-init"
 	hooks "kubevirt.io/kubevirt/pkg/hooks"
 	hooksInfo "kubevirt.io/kubevirt/pkg/hooks/info"
 	hooksV1alpha2 "kubevirt.io/kubevirt/pkg/hooks/v1alpha2"
-	"kubevirt.io/kubevirt/pkg/log"
 )
 
 type infoServer struct{}

diff --git a/cmd/example-hook-sidecar/BUILD.bazel b/cmd/example-hook-sidecar/BUILD.bazel
@@ -6,14 +6,14 @@ go_library(
     importpath = "kubevirt.io/kubevirt/cmd/example-hook-sidecar",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/hooks:go_default_library",
         "//pkg/hooks/info:go_default_library",
         "//pkg/hooks/v1alpha1:go_default_library",
         "//pkg/hooks/v1alpha2:go_default_library",
-        "//pkg/log:go_default_library",
         "//pkg/virt-launcher/virtwrap/api:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
+        "//vendor/kubevirt.io/client-go/api/v1:go_default_library",
+        "//vendor/kubevirt.io/client-go/log:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
     ],
 )

diff --git a/cmd/example-hook-sidecar/smbios.go b/cmd/example-hook-sidecar/smbios.go
@@ -29,12 +29,12 @@ import (
 	"github.com/spf13/pflag"
 	"google.golang.org/grpc"
 
-	vmSchema "kubevirt.io/kubevirt/pkg/api/v1"
+	vmSchema "kubevirt.io/client-go/api/v1"
+	"kubevirt.io/client-go/log"
 	"kubevirt.io/kubevirt/pkg/hooks"
 	hooksInfo "kubevirt.io/kubevirt/pkg/hooks/info"
 	hooksV1alpha1 "kubevirt.io/kubevirt/pkg/hooks/v1alpha1"
 	hooksV1alpha2 "kubevirt.io/kubevirt/pkg/hooks/v1alpha2"
-	"kubevirt.io/kubevirt/pkg/log"
 	domainSchema "kubevirt.io/kubevirt/pkg/virt-launcher/virtwrap/api"
 )
 

diff --git a/cmd/subresource-access-test/BUILD.bazel b/cmd/subresource-access-test/BUILD.bazel
@@ -6,8 +6,8 @@ go_library(
     importpath = "kubevirt.io/kubevirt/cmd/subresource-access-test",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/kubecli:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
+        "//vendor/kubevirt.io/client-go/kubecli:go_default_library",
     ],
 )
 

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"
 
-	"kubevirt.io/kubevirt/pkg/kubecli"
+	"kubevirt.io/client-go/kubecli"
 )
 
 func main() {

diff --git a/cmd/virt-api/BUILD.bazel b/cmd/virt-api/BUILD.bazel
@@ -6,16 +6,16 @@ go_library(
     importpath = "kubevirt.io/kubevirt/cmd/virt-api",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/log:go_default_library",
         "//pkg/monitoring/client/prometheus:go_default_library",
         "//pkg/monitoring/reflector/prometheus:go_default_library",
         "//pkg/monitoring/workqueue/prometheus:go_default_library",
         "//pkg/service:go_default_library",
         "//pkg/virt-api:go_default_library",
+        "//vendor/kubevirt.io/client-go/log:go_default_library",
     ],
 )
 
-load("//pkg/version:def.bzl", "version_x_defs")
+load("//vendor/kubevirt.io/client-go/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "virt-api",

diff --git a/cmd/virt-api/virt-api.go b/cmd/virt-api/virt-api.go
@@ -20,7 +20,7 @@
 package main
 
 import (
-	klog "kubevirt.io/kubevirt/pkg/log"
+	klog "kubevirt.io/client-go/log"
 	_ "kubevirt.io/kubevirt/pkg/monitoring/client/prometheus"    // import for prometheus metrics
 	_ "kubevirt.io/kubevirt/pkg/monitoring/reflector/prometheus" // import for prometheus metrics
 	_ "kubevirt.io/kubevirt/pkg/monitoring/workqueue/prometheus" // import for prometheus metrics

diff --git a/cmd/virt-controller/BUILD.bazel b/cmd/virt-controller/BUILD.bazel
@@ -13,7 +13,7 @@ go_library(
     ],
 )
 
-load("//pkg/version:def.bzl", "version_x_defs")
+load("//vendor/kubevirt.io/client-go/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "virt-controller",

diff --git a/cmd/virt-handler/BUILD.bazel b/cmd/virt-handler/BUILD.bazel
@@ -6,13 +6,10 @@ go_library(
     importpath = "kubevirt.io/kubevirt/cmd/virt-handler",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/certificates:go_default_library",
         "//pkg/certificates/triple:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/inotify-informer:go_default_library",
-        "//pkg/kubecli:go_default_library",
-        "//pkg/log:go_default_library",
         "//pkg/monitoring/client/prometheus:go_default_library",
         "//pkg/monitoring/reflector/prometheus:go_default_library",
         "//pkg/monitoring/vms/prometheus:go_default_library",
@@ -36,10 +33,13 @@ go_library(
         "//vendor/k8s.io/client-go/tools/cache:go_default_library",
         "//vendor/k8s.io/client-go/tools/record:go_default_library",
         "//vendor/k8s.io/client-go/util/cert:go_default_library",
+        "//vendor/kubevirt.io/client-go/api/v1:go_default_library",
+        "//vendor/kubevirt.io/client-go/kubecli:go_default_library",
+        "//vendor/kubevirt.io/client-go/log:go_default_library",
     ],
 )
 
-load("//pkg/version:def.bzl", "version_x_defs")
+load("//vendor/kubevirt.io/client-go/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "virt-handler",

diff --git a/cmd/virt-handler/virt-handler.go b/cmd/virt-handler/virt-handler.go
@@ -42,13 +42,13 @@ import (
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/cert"
 
-	v1 "kubevirt.io/kubevirt/pkg/api/v1"
+	v1 "kubevirt.io/client-go/api/v1"
+	"kubevirt.io/client-go/kubecli"
+	"kubevirt.io/client-go/log"
 	"kubevirt.io/kubevirt/pkg/certificates"
 	"kubevirt.io/kubevirt/pkg/certificates/triple"
 	"kubevirt.io/kubevirt/pkg/controller"
 	inotifyinformer "kubevirt.io/kubevirt/pkg/inotify-informer"
-	"kubevirt.io/kubevirt/pkg/kubecli"
-	"kubevirt.io/kubevirt/pkg/log"
 	_ "kubevirt.io/kubevirt/pkg/monitoring/client/prometheus"    // import for prometheus metrics
 	_ "kubevirt.io/kubevirt/pkg/monitoring/reflector/prometheus" // import for prometheus metrics
 	promvm "kubevirt.io/kubevirt/pkg/monitoring/vms/prometheus"  // import for prometheus metrics

diff --git a/cmd/virt-launcher/BUILD.bazel b/cmd/virt-launcher/BUILD.bazel
@@ -6,14 +6,12 @@ go_library(
     importpath = "kubevirt.io/kubevirt/cmd/virt-launcher",
     visibility = ["//visibility:private"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/cloud-init:go_default_library",
         "//pkg/config:go_default_library",
         "//pkg/container-disk:go_default_library",
         "//pkg/ephemeral-disk:go_default_library",
         "//pkg/hooks:go_default_library",
         "//pkg/ignition:go_default_library",
-        "//pkg/log:go_default_library",
         "//pkg/virt-handler/cmd-client:go_default_library",
         "//pkg/virt-launcher:go_default_library",
         "//pkg/virt-launcher/notify-client:go_default_library",
@@ -28,10 +26,12 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
+        "//vendor/kubevirt.io/client-go/api/v1:go_default_library",
+        "//vendor/kubevirt.io/client-go/log:go_default_library",
     ],
 )
 
-load("//pkg/version:def.bzl", "version_x_defs")
+load("//vendor/kubevirt.io/client-go/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "virt-launcher",

diff --git a/cmd/virt-launcher/virt-launcher.go b/cmd/virt-launcher/virt-launcher.go
@@ -37,14 +37,14 @@ import (
 	utilwait "k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
 
-	v1 "kubevirt.io/kubevirt/pkg/api/v1"
+	v1 "kubevirt.io/client-go/api/v1"
+	"kubevirt.io/client-go/log"
 	cloudinit "kubevirt.io/kubevirt/pkg/cloud-init"
 	"kubevirt.io/kubevirt/pkg/config"
 	containerdisk "kubevirt.io/kubevirt/pkg/container-disk"
 	ephemeraldisk "kubevirt.io/kubevirt/pkg/ephemeral-disk"
 	"kubevirt.io/kubevirt/pkg/hooks"
 	"kubevirt.io/kubevirt/pkg/ignition"
-	"kubevirt.io/kubevirt/pkg/log"
 	cmdclient "kubevirt.io/kubevirt/pkg/virt-handler/cmd-client"
 	virtlauncher "kubevirt.io/kubevirt/pkg/virt-launcher"
 	notifyclient "kubevirt.io/kubevirt/pkg/virt-launcher/notify-client"

diff --git a/cmd/virtctl/BUILD.bazel b/cmd/virtctl/BUILD.bazel
@@ -11,7 +11,7 @@ go_library(
     ],
 )
 
-load("//pkg/version:def.bzl", "version_x_defs")
+load("//vendor/kubevirt.io/client-go/version:def.bzl", "version_x_defs")
 
 go_binary(
     name = "virtctl",

diff --git a/go.mod b/go.mod
@@ -84,7 +84,8 @@ require (
 	k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
 	k8s.io/klog v0.3.0 // indirect
 	k8s.io/kube-aggregator v0.0.0-20190228175259-3e0149950b0e
-	k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
+	k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 // indirect
+	kubevirt.io/client-go v0.0.0-00010101000000-000000000000
 	kubevirt.io/containerized-data-importer v1.8.1-0.20190516083534-83c12eaae2ed
 	kubevirt.io/qe-tools v0.1.3-0.20190512140058-934db0579e0c
 	sigs.k8s.io/controller-runtime v0.1.9 // indirect
@@ -108,3 +109,5 @@ replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v11.0.0+inc
 replace kubevirt.io/containerized-data-importer => kubevirt.io/containerized-data-importer v1.8.1-0.20190530153240-6734c225525a
 
 replace github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190401163519-84c2b942258a
+
+replace kubevirt.io/client-go => ./staging/src/kubevirt.io/client-go
diff --git a/hack/dep-prune.sh b/hack/dep-prune.sh
@@ -3,5 +3,3 @@ for file in $(find vendor/ -name "*_test.go"); do rm ${file}; done
 rm -rf vendor/github.com/golang/glog
 mkdir -p vendor/github.com/golang/
 ln -s ../../../pkg/staging/glog/ vendor/github.com/golang/glog
-#create link of client-go from staging
-ln -s ../../staging/src/kubevirt.io/client-go vendor/kubevirt.io/client-go
diff --git a/hack/gen-swagger-doc/gen-swagger-docs.sh b/hack/gen-swagger-doc/gen-swagger-docs.sh
@@ -42,7 +42,7 @@ gradle -b $GRADLE_BUILD_FILE $GRADLE_EXTRA_PARAMS convertSwagger2markup --info
 
 #insert a TOC for top level API objects
 buf="${HEADER}${HEADER} Top Level API Objects\n\n"
-top_level_models=$(grep '&[A-Za-z]*{},' pkg/api/${VERSION}/types.go | sed 's/.*&//;s/{},//')
+top_level_models=$(grep '&[A-Za-z]*{},' staging/src/kubevirt.io/client-go/api/${VERSION}/types.go | sed 's/.*&//;s/{},//')
 
 # check if the top level models exist in the definitions.$SUFFIX. If they exist,
 # their name will be <version>.<model_name>

diff --git a/hack/version.sh b/hack/version.sh
@@ -96,7 +96,7 @@ function kubevirt::version::ldflag() {
     local key=${1}
     local val=${2}
 
-    echo "-X kubevirt.io/kubevirt/pkg/version.${key}=${val}"
+    echo "-X kubevirt.io/client-go/version.${key}=${val}"
 }
 
 # Prints the value that needs to be passed to the -ldflags parameter of go build

diff --git a/pkg/certificates/BUILD.bazel b/pkg/certificates/BUILD.bazel
@@ -20,8 +20,8 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/log:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
+        "//vendor/kubevirt.io/client-go/log:go_default_library",
     ],
 )
diff --git a/pkg/certificates/certificates_suite_test.go b/pkg/certificates/certificates_suite_test.go
@@ -6,7 +6,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"kubevirt.io/kubevirt/pkg/log"
+	"kubevirt.io/client-go/log"
 )
 
 func TestCertificates(t *testing.T) {

diff --git a/pkg/cloud-init/BUILD.bazel b/pkg/cloud-init/BUILD.bazel
@@ -6,14 +6,14 @@ go_library(
     importpath = "kubevirt.io/kubevirt/pkg/cloud-init",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/api/v1:go_default_library",
         "//pkg/ephemeral-disk-utils:go_default_library",
-        "//pkg/kubecli:go_default_library",
-        "//pkg/log:go_default_library",
-        "//pkg/precond:go_default_library",
         "//pkg/util/net/dns:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/kubevirt.io/client-go/api/v1:go_default_library",
+        "//vendor/kubevirt.io/client-go/kubecli:go_default_library",
+        "//vendor/kubevirt.io/client-go/log:go_default_library",
+        "//vendor/kubevirt.io/client-go/precond:go_default_library",
     ],
 )
 
@@ -25,15 +25,15 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/api/v1:go_default_library",
-        "//pkg/kubecli:go_default_library",
-        "//pkg/log:go_default_library",
-        "//pkg/precond:go_default_library",
         "//vendor/github.com/golang/mock/gomock:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
+        "//vendor/kubevirt.io/client-go/api/v1:go_default_library",
+        "//vendor/kubevirt.io/client-go/kubecli:go_default_library",
+        "//vendor/kubevirt.io/client-go/log:go_default_library",
+        "//vendor/kubevirt.io/client-go/precond:go_default_library",
     ],
 )
diff --git a/pkg/cloud-init/cloud-init.go b/pkg/cloud-init/cloud-init.go
@@ -30,11 +30,11 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	v1 "kubevirt.io/kubevirt/pkg/api/v1"
+	v1 "kubevirt.io/client-go/api/v1"
+	"kubevirt.io/client-go/kubecli"
+	"kubevirt.io/client-go/log"
+	"kubevirt.io/client-go/precond"
 	diskutils "kubevirt.io/kubevirt/pkg/ephemeral-disk-utils"
-	"kubevirt.io/kubevirt/pkg/kubecli"
-	"kubevirt.io/kubevirt/pkg/log"
-	"kubevirt.io/kubevirt/pkg/precond"
 	"kubevirt.io/kubevirt/pkg/util/net/dns"
 )
 

diff --git a/pkg/cloud-init/cloud-init_test.go b/pkg/cloud-init/cloud-init_test.go
@@ -36,9 +36,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/fake"
 
-	v1 "kubevirt.io/kubevirt/pkg/api/v1"
-	"kubevirt.io/kubevirt/pkg/kubecli"
-	"kubevirt.io/kubevirt/pkg/precond"
+	v1 "kubevirt.io/client-go/api/v1"
+	"kubevirt.io/client-go/kubecli"
+	"kubevirt.io/client-go/precond"
 )
 
 var _ = Describe("CloudInit", func() {

diff --git a/pkg/cloud-init/cloudinit_suite_test.go b/pkg/cloud-init/cloudinit_suite_test.go
@@ -25,7 +25,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	"kubevirt.io/kubevirt/pkg/log"
+	"kubevirt.io/client-go/log"
 )
 
 func TestCloudInit(t *testing.T) {

diff --git a/pkg/config/BUILD.bazel b/pkg/config/BUILD.bazel
@@ -10,7 +10,7 @@ go_library(
     ],
     importpath = "kubevirt.io/kubevirt/pkg/config",
     visibility = ["//visibility:public"],
-    deps = ["//pkg/api/v1:go_default_library"],
+    deps = ["//vendor/kubevirt.io/client-go/api/v1:go_default_library"],
 )
 
 go_test(
@@ -24,10 +24,10 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/api/v1:go_default_library",
-        "//pkg/log:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
+        "//vendor/kubevirt.io/client-go/api/v1:go_default_library",
+        "//vendor/kubevirt.io/client-go/log:go_default_library",
     ],
 )
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/kubevirt/pkg/api/v1"
+	v1 "kubevirt.io/client-go/api/v1"
 )
 
 // GetConfigMapSourcePath returns a path to ConfigMap mounted on a pod

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/kubevirt/pkg/api/v1"
+	v1 "kubevirt.io/client-go/api/v1"
 )
 
 var _ = Describe("ConfigMap", func() {