github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: cleanup deps on pkg/version

Browse Source
This commit is contained in:
SataQiu 2019-06-18 11:01:30 +08:00
parent 88f8c785b4
commit 10ddd7caf0
13 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/.import-restrictions
View File

@ -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",

2
cmd/kubeadm/BUILD
View File

@ -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",

2
cmd/kubeadm/app/cmd/BUILD
View File

@ -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",

4
cmd/kubeadm/app/cmd/phases/BUILD
View File

@ -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",
],
)

2
cmd/kubeadm/app/cmd/phases/util.go
View File

@ -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,

2
cmd/kubeadm/app/cmd/phases/util_test.go
View File

@ -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) {

2
cmd/kubeadm/app/cmd/version.go
View File

@ -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.

2
cmd/kubeadm/app/phases/upgrade/BUILD
View File

@ -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",
],
)

2
cmd/kubeadm/app/phases/upgrade/versiongetter.go
View File

@ -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.

2
cmd/kubeadm/app/preflight/BUILD
View File

@ -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",

2
cmd/kubeadm/app/preflight/checks.go
View File

@ -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"
)

2
cmd/kubeadm/app/util/BUILD
View File

@ -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",

2
cmd/kubeadm/app/util/version.go
View File

@ -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 (