From 10ddd7caf04c91d23191a209e228f077efbff3a5 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Tue, 18 Jun 2019 11:01:30 +0800 Subject: [PATCH] kubeadm: cleanup deps on pkg/version --- cmd/kubeadm/.import-restrictions | 3 +-- cmd/kubeadm/BUILD | 2 +- cmd/kubeadm/app/cmd/BUILD | 2 +- cmd/kubeadm/app/cmd/phases/BUILD | 4 ++-- cmd/kubeadm/app/cmd/phases/util.go | 2 +- cmd/kubeadm/app/cmd/phases/util_test.go | 2 +- cmd/kubeadm/app/cmd/version.go | 2 +- cmd/kubeadm/app/phases/upgrade/BUILD | 2 +- cmd/kubeadm/app/phases/upgrade/versiongetter.go | 2 +- cmd/kubeadm/app/preflight/BUILD | 2 +- cmd/kubeadm/app/preflight/checks.go | 2 +- cmd/kubeadm/app/util/BUILD | 2 +- cmd/kubeadm/app/util/version.go | 2 +- 13 files changed, 14 insertions(+), 15 deletions(-) diff --git a/cmd/kubeadm/.import-restrictions b/cmd/kubeadm/.import-restrictions index 510a28f8525..c48de967360 100644 --- a/cmd/kubeadm/.import-restrictions +++ b/cmd/kubeadm/.import-restrictions @@ -88,8 +88,7 @@ "k8s.io/kubernetes/pkg/util/parsers", "k8s.io/kubernetes/pkg/util/procfs", "k8s.io/kubernetes/pkg/util/sysctl", - "k8s.io/kubernetes/pkg/util/taints", - "k8s.io/kubernetes/pkg/version" + "k8s.io/kubernetes/pkg/util/taints" ], "ForbiddenPrefixes": [ "k8s.io/kubernetes/pkg/cloudprovider/providers", diff --git a/cmd/kubeadm/BUILD b/cmd/kubeadm/BUILD index 8e45f031df0..ba67e949278 100644 --- a/cmd/kubeadm/BUILD +++ b/cmd/kubeadm/BUILD @@ -5,7 +5,7 @@ load( "go_binary", "go_library", ) -load("//pkg/version:def.bzl", "version_x_defs") +load("//vendor/k8s.io/client-go/pkg/version:def.bzl", "version_x_defs") go_binary( name = "kubeadm", diff --git a/cmd/kubeadm/app/cmd/BUILD b/cmd/kubeadm/app/cmd/BUILD index de0daf9322d..8e7dabbd7e7 100644 --- a/cmd/kubeadm/app/cmd/BUILD +++ b/cmd/kubeadm/app/cmd/BUILD @@ -47,13 +47,13 @@ go_library( "//cmd/kubeadm/app/util/config:go_default_library", "//cmd/kubeadm/app/util/kubeconfig:go_default_library", "//cmd/kubeadm/app/util/runtime:go_default_library", - "//pkg/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/duration:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/client-go/pkg/version:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd/api:go_default_library", "//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library", diff --git a/cmd/kubeadm/app/cmd/phases/BUILD b/cmd/kubeadm/app/cmd/phases/BUILD index 6b0aa73f063..03dcb75e035 100644 --- a/cmd/kubeadm/app/cmd/phases/BUILD +++ b/cmd/kubeadm/app/cmd/phases/BUILD @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//cmd/kubeadm/app/apis/kubeadm/v1beta2:go_default_library", - "//pkg/version:go_default_library", + "//staging/src/k8s.io/client-go/pkg/version:go_default_library", ], ) @@ -17,7 +17,7 @@ go_test( embed = [":go_default_library"], deps = [ "//cmd/kubeadm/app/apis/kubeadm/v1beta2:go_default_library", - "//pkg/version:go_default_library", + "//staging/src/k8s.io/client-go/pkg/version:go_default_library", ], ) diff --git a/cmd/kubeadm/app/cmd/phases/util.go b/cmd/kubeadm/app/cmd/phases/util.go index dcb1f2249d9..6d21f4e0d3c 100644 --- a/cmd/kubeadm/app/cmd/phases/util.go +++ b/cmd/kubeadm/app/cmd/phases/util.go @@ -17,8 +17,8 @@ limitations under the License. package phases import ( + "k8s.io/client-go/pkg/version" kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/pkg/version" ) // SetKubernetesVersion gets the current Kubeadm version and sets it as KubeadmVersion in the config, diff --git a/cmd/kubeadm/app/cmd/phases/util_test.go b/cmd/kubeadm/app/cmd/phases/util_test.go index c74092d223c..52b3a730adb 100644 --- a/cmd/kubeadm/app/cmd/phases/util_test.go +++ b/cmd/kubeadm/app/cmd/phases/util_test.go @@ -19,8 +19,8 @@ package phases import ( "testing" + "k8s.io/client-go/pkg/version" kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/pkg/version" ) func TestSetKubernetesVersion(t *testing.T) { diff --git a/cmd/kubeadm/app/cmd/version.go b/cmd/kubeadm/app/cmd/version.go index 2d237d50b20..bef91d72768 100644 --- a/cmd/kubeadm/app/cmd/version.go +++ b/cmd/kubeadm/app/cmd/version.go @@ -27,8 +27,8 @@ import ( "sigs.k8s.io/yaml" apimachineryversion "k8s.io/apimachinery/pkg/version" + "k8s.io/client-go/pkg/version" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - "k8s.io/kubernetes/pkg/version" ) // Version provides the version information of kubeadm. diff --git a/cmd/kubeadm/app/phases/upgrade/BUILD b/cmd/kubeadm/app/phases/upgrade/BUILD index b3eff4a6df4..a34d3e214dd 100644 --- a/cmd/kubeadm/app/phases/upgrade/BUILD +++ b/cmd/kubeadm/app/phases/upgrade/BUILD @@ -34,7 +34,6 @@ go_library( "//cmd/kubeadm/app/util/dryrun:go_default_library", "//cmd/kubeadm/app/util/etcd:go_default_library", "//cmd/kubeadm/app/util/staticpod:go_default_library", - "//pkg/version:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -44,6 +43,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/client-go/pkg/version:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", ], ) diff --git a/cmd/kubeadm/app/phases/upgrade/versiongetter.go b/cmd/kubeadm/app/phases/upgrade/versiongetter.go index 377f4a14b6f..9af1ddf5c06 100644 --- a/cmd/kubeadm/app/phases/upgrade/versiongetter.go +++ b/cmd/kubeadm/app/phases/upgrade/versiongetter.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" versionutil "k8s.io/apimachinery/pkg/util/version" clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/pkg/version" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - "k8s.io/kubernetes/pkg/version" ) // VersionGetter defines an interface for fetching different versions. diff --git a/cmd/kubeadm/app/preflight/BUILD b/cmd/kubeadm/app/preflight/BUILD index f1841b3b79e..f0bfb3f53f1 100644 --- a/cmd/kubeadm/app/preflight/BUILD +++ b/cmd/kubeadm/app/preflight/BUILD @@ -27,10 +27,10 @@ go_library( "//pkg/registry/core/service/ipallocator:go_default_library", "//pkg/util/initsystem:go_default_library", "//pkg/util/ipvs:go_default_library", - "//pkg/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", + "//staging/src/k8s.io/client-go/pkg/version:go_default_library", "//vendor/github.com/PuerkitoBio/purell:go_default_library", "//vendor/github.com/blang/semver:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index 5b6448e63f9..ec5efffe919 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -40,6 +40,7 @@ import ( netutil "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" versionutil "k8s.io/apimachinery/pkg/util/version" + kubeadmversion "k8s.io/client-go/pkg/version" "k8s.io/klog" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" @@ -50,7 +51,6 @@ import ( "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/util/initsystem" ipvsutil "k8s.io/kubernetes/pkg/util/ipvs" - kubeadmversion "k8s.io/kubernetes/pkg/version" utilsexec "k8s.io/utils/exec" ) diff --git a/cmd/kubeadm/app/util/BUILD b/cmd/kubeadm/app/util/BUILD index a4de2a1f7a7..21b7fb09ee4 100644 --- a/cmd/kubeadm/app/util/BUILD +++ b/cmd/kubeadm/app/util/BUILD @@ -24,7 +24,6 @@ go_library( deps = [ "//cmd/kubeadm/app/apis/kubeadm:go_default_library", "//cmd/kubeadm/app/constants:go_default_library", - "//pkg/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", @@ -34,6 +33,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/yaml:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", + "//staging/src/k8s.io/client-go/pkg/version:go_default_library", "//vendor/github.com/pkg/errors:go_default_library", "//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/utils/exec:go_default_library", diff --git a/cmd/kubeadm/app/util/version.go b/cmd/kubeadm/app/util/version.go index 4e90b27dda6..b1b65250512 100644 --- a/cmd/kubeadm/app/util/version.go +++ b/cmd/kubeadm/app/util/version.go @@ -28,9 +28,9 @@ import ( netutil "k8s.io/apimachinery/pkg/util/net" versionutil "k8s.io/apimachinery/pkg/util/version" + pkgversion "k8s.io/client-go/pkg/version" "k8s.io/klog" "k8s.io/kubernetes/cmd/kubeadm/app/constants" - pkgversion "k8s.io/kubernetes/pkg/version" ) const (