From 088cf3c37bdc3270055cfb71e2d7c2d6408c5be9 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Thu, 20 Sep 2018 22:06:51 -0700 Subject: [PATCH] find & replace version import --- cmd/kubeadm/.import-restrictions | 2 +- cmd/kubeadm/app/cmd/phases/kubelet.go | 2 +- cmd/kubeadm/app/cmd/upgrade/apply.go | 2 +- cmd/kubeadm/app/cmd/upgrade/diff.go | 2 +- cmd/kubeadm/app/cmd/upgrade/node.go | 2 +- cmd/kubeadm/app/cmd/upgrade/plan.go | 2 +- cmd/kubeadm/app/componentconfigs/config.go | 2 +- cmd/kubeadm/app/componentconfigs/config_test.go | 2 +- cmd/kubeadm/app/componentconfigs/registrations.go | 2 +- cmd/kubeadm/app/constants/constants.go | 2 +- cmd/kubeadm/app/constants/constants_test.go | 2 +- cmd/kubeadm/app/features/features.go | 2 +- cmd/kubeadm/app/features/features_test.go | 2 +- cmd/kubeadm/app/phases/controlplane/manifests.go | 2 +- cmd/kubeadm/app/phases/controlplane/manifests_test.go | 2 +- cmd/kubeadm/app/phases/kubelet/config.go | 2 +- cmd/kubeadm/app/phases/kubelet/config_test.go | 2 +- cmd/kubeadm/app/phases/kubelet/dynamic.go | 2 +- cmd/kubeadm/app/phases/kubelet/dynamic_test.go | 2 +- cmd/kubeadm/app/phases/upgrade/compute.go | 2 +- cmd/kubeadm/app/phases/upgrade/compute_test.go | 2 +- cmd/kubeadm/app/phases/upgrade/policy.go | 2 +- cmd/kubeadm/app/phases/upgrade/policy_test.go | 2 +- cmd/kubeadm/app/phases/upgrade/postupgrade.go | 2 +- cmd/kubeadm/app/phases/upgrade/prepull_test.go | 2 +- cmd/kubeadm/app/phases/upgrade/selfhosted.go | 2 +- cmd/kubeadm/app/phases/upgrade/staticpods.go | 2 +- cmd/kubeadm/app/phases/upgrade/versiongetter.go | 2 +- cmd/kubeadm/app/preflight/checks.go | 2 +- cmd/kubeadm/app/preflight/utils.go | 2 +- cmd/kubeadm/app/util/config/cluster.go | 2 +- cmd/kubeadm/app/util/config/cluster_test.go | 2 +- cmd/kubeadm/app/util/config/common.go | 2 +- cmd/kubeadm/app/util/version.go | 2 +- pkg/cloudprovider/providers/gce/gce_healthchecks.go | 2 +- pkg/cloudprovider/providers/vsphere/vsphere_util.go | 2 +- pkg/kubelet/cm/container_manager_linux.go | 2 +- pkg/kubelet/dockershim/cm/container_manager_linux.go | 2 +- pkg/kubelet/kuberuntime/kuberuntime_manager.go | 2 +- pkg/proxy/iptables/proxier.go | 2 +- pkg/proxy/ipvs/ipset.go | 2 +- pkg/util/iptables/iptables.go | 2 +- staging/src/k8s.io/apimachinery/pkg/util/version/doc.go | 2 +- test/e2e/apimachinery/aggregator.go | 2 +- test/e2e/apimachinery/custom_resource_definition.go | 2 +- test/e2e/apimachinery/table_conversion.go | 2 +- test/e2e/apimachinery/webhook.go | 2 +- test/e2e/common/downward_api.go | 2 +- test/e2e/framework/util.go | 2 +- test/e2e/lifecycle/cluster_upgrade.go | 2 +- test/e2e/scheduling/predicates.go | 2 +- test/e2e/storage/flexvolume.go | 2 +- test/e2e/upgrades/apps/statefulset.go | 2 +- test/e2e/upgrades/cassandra.go | 2 +- test/e2e/upgrades/etcd.go | 2 +- test/e2e/upgrades/ingress.go | 2 +- test/e2e/upgrades/mysql.go | 2 +- test/e2e/upgrades/upgrade.go | 2 +- test/test_owners.csv | 2 +- 59 files changed, 59 insertions(+), 59 deletions(-) diff --git a/cmd/kubeadm/.import-restrictions b/cmd/kubeadm/.import-restrictions index b2a0616312..0556c4e244 100644 --- a/cmd/kubeadm/.import-restrictions +++ b/cmd/kubeadm/.import-restrictions @@ -139,7 +139,7 @@ "k8s.io/kubernetes/pkg/util/procfs", "k8s.io/kubernetes/pkg/util/slice", "k8s.io/kubernetes/pkg/util/taints", - "k8s.io/kubernetes/pkg/util/version", + "k8s.io/apimachinery/pkg/util/version", "k8s.io/kubernetes/pkg/util/ipvs", "k8s.io/kubernetes/pkg/version", "k8s.io/kubernetes/pkg/volume", diff --git a/cmd/kubeadm/app/cmd/phases/kubelet.go b/cmd/kubeadm/app/cmd/phases/kubelet.go index 07506c8e57..61340ad7c7 100644 --- a/cmd/kubeadm/app/cmd/phases/kubelet.go +++ b/cmd/kubeadm/app/cmd/phases/kubelet.go @@ -33,7 +33,7 @@ import ( configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" "k8s.io/kubernetes/pkg/util/normalizer" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" utilsexec "k8s.io/utils/exec" ) diff --git a/cmd/kubeadm/app/cmd/upgrade/apply.go b/cmd/kubeadm/app/cmd/upgrade/apply.go index c4d846346c..4aacb8f185 100644 --- a/cmd/kubeadm/app/cmd/upgrade/apply.go +++ b/cmd/kubeadm/app/cmd/upgrade/apply.go @@ -38,7 +38,7 @@ import ( configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun" etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) const ( diff --git a/cmd/kubeadm/app/cmd/upgrade/diff.go b/cmd/kubeadm/app/cmd/upgrade/diff.go index 343001da2c..d04c61d940 100644 --- a/cmd/kubeadm/app/cmd/upgrade/diff.go +++ b/cmd/kubeadm/app/cmd/upgrade/diff.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/phases/controlplane" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) type diffFlags struct { diff --git a/cmd/kubeadm/app/cmd/upgrade/node.go b/cmd/kubeadm/app/cmd/upgrade/node.go index d6979d4e00..0a0ecb13cc 100644 --- a/cmd/kubeadm/app/cmd/upgrade/node.go +++ b/cmd/kubeadm/app/cmd/upgrade/node.go @@ -36,7 +36,7 @@ import ( dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun" "k8s.io/kubernetes/pkg/util/node" "k8s.io/kubernetes/pkg/util/normalizer" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) var ( diff --git a/cmd/kubeadm/app/cmd/upgrade/plan.go b/cmd/kubeadm/app/cmd/upgrade/plan.go index f14c640ae5..40d7148398 100644 --- a/cmd/kubeadm/app/cmd/upgrade/plan.go +++ b/cmd/kubeadm/app/cmd/upgrade/plan.go @@ -34,7 +34,7 @@ import ( kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) type planFlags struct { diff --git a/cmd/kubeadm/app/componentconfigs/config.go b/cmd/kubeadm/app/componentconfigs/config.go index df4443cd5c..691c8d5e84 100644 --- a/cmd/kubeadm/app/componentconfigs/config.go +++ b/cmd/kubeadm/app/componentconfigs/config.go @@ -25,7 +25,7 @@ import ( kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) // GetFromKubeletConfigMap returns the pointer to the ComponentConfig API object read from the kubelet-config-version diff --git a/cmd/kubeadm/app/componentconfigs/config_test.go b/cmd/kubeadm/app/componentconfigs/config_test.go index 9372e6f46e..d5c73a0880 100644 --- a/cmd/kubeadm/app/componentconfigs/config_test.go +++ b/cmd/kubeadm/app/componentconfigs/config_test.go @@ -25,7 +25,7 @@ import ( clientsetfake "k8s.io/client-go/kubernetes/fake" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) var cfgFiles = map[string][]byte{ diff --git a/cmd/kubeadm/app/componentconfigs/registrations.go b/cmd/kubeadm/app/componentconfigs/registrations.go index 7542d7793c..7b41752988 100644 --- a/cmd/kubeadm/app/componentconfigs/registrations.go +++ b/cmd/kubeadm/app/componentconfigs/registrations.go @@ -27,7 +27,7 @@ import ( kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) // AddToSchemeFunc is a function that adds known types and API GroupVersions to a scheme diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 86ac6cdecf..528e3de189 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -28,7 +28,7 @@ import ( "k8s.io/api/core/v1" bootstrapapi "k8s.io/client-go/tools/bootstrap/token/api" "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) // KubernetesDir is the directory kubernetes owns for storing various configuration files diff --git a/cmd/kubeadm/app/constants/constants_test.go b/cmd/kubeadm/app/constants/constants_test.go index 317406f0fb..1882a28410 100644 --- a/cmd/kubeadm/app/constants/constants_test.go +++ b/cmd/kubeadm/app/constants/constants_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) func TestGetStaticPodDirectory(t *testing.T) { diff --git a/cmd/kubeadm/app/features/features.go b/cmd/kubeadm/app/features/features.go index c87f24072f..8a4d81003c 100644 --- a/cmd/kubeadm/app/features/features.go +++ b/cmd/kubeadm/app/features/features.go @@ -23,7 +23,7 @@ import ( "strings" utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) const ( diff --git a/cmd/kubeadm/app/features/features_test.go b/cmd/kubeadm/app/features/features_test.go index 21ba8edf7a..f4037a0f54 100644 --- a/cmd/kubeadm/app/features/features_test.go +++ b/cmd/kubeadm/app/features/features_test.go @@ -21,7 +21,7 @@ import ( "testing" utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) var TestMinVersion = version.MustParseSemantic("v1.11.0-alpha.1") diff --git a/cmd/kubeadm/app/phases/controlplane/manifests.go b/cmd/kubeadm/app/phases/controlplane/manifests.go index 3303e0a070..927c0e944f 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests.go @@ -36,7 +36,7 @@ import ( kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" staticpodutil "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" authzmodes "k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) // CreateInitStaticPodManifestFiles will write all static pod manifest files needed to bring up the control plane. diff --git a/cmd/kubeadm/app/phases/controlplane/manifests_test.go b/cmd/kubeadm/app/phases/controlplane/manifests_test.go index de6478756e..23dbee95b0 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests_test.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/features" "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" authzmodes "k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" testutil "k8s.io/kubernetes/cmd/kubeadm/test" utilpointer "k8s.io/utils/pointer" diff --git a/cmd/kubeadm/app/phases/kubelet/config.go b/cmd/kubeadm/app/phases/kubelet/config.go index 87dea28597..a8da3b4da2 100644 --- a/cmd/kubeadm/app/phases/kubelet/config.go +++ b/cmd/kubeadm/app/phases/kubelet/config.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" rbachelper "k8s.io/kubernetes/pkg/apis/rbac/v1" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) // WriteConfigToDisk writes the kubelet config object down to a file diff --git a/cmd/kubeadm/app/phases/kubelet/config_test.go b/cmd/kubeadm/app/phases/kubelet/config_test.go index 11f29613d8..c51e7e988d 100644 --- a/cmd/kubeadm/app/phases/kubelet/config_test.go +++ b/cmd/kubeadm/app/phases/kubelet/config_test.go @@ -26,7 +26,7 @@ import ( core "k8s.io/client-go/testing" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) func TestCreateConfigMap(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/kubelet/dynamic.go b/cmd/kubeadm/app/phases/kubelet/dynamic.go index f16131b075..a838f6e0b3 100644 --- a/cmd/kubeadm/app/phases/kubelet/dynamic.go +++ b/cmd/kubeadm/app/phases/kubelet/dynamic.go @@ -24,7 +24,7 @@ import ( clientset "k8s.io/client-go/kubernetes" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) // EnableDynamicConfigForNode updates the Node's ConfigSource to enable Dynamic Kubelet Configuration, depending on what version the kubelet is diff --git a/cmd/kubeadm/app/phases/kubelet/dynamic_test.go b/cmd/kubeadm/app/phases/kubelet/dynamic_test.go index 150eeda405..68af602a90 100644 --- a/cmd/kubeadm/app/phases/kubelet/dynamic_test.go +++ b/cmd/kubeadm/app/phases/kubelet/dynamic_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) func TestEnableDynamicConfigForNode(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/upgrade/compute.go b/cmd/kubeadm/app/phases/upgrade/compute.go index 326951168f..76dcf591c7 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute.go +++ b/cmd/kubeadm/app/phases/upgrade/compute.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/features" "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns" etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" - versionutil "k8s.io/kubernetes/pkg/util/version" + versionutil "k8s.io/apimachinery/pkg/util/version" ) // Upgrade defines an upgrade possibility to upgrade from a current version to a new one diff --git a/cmd/kubeadm/app/phases/upgrade/compute_test.go b/cmd/kubeadm/app/phases/upgrade/compute_test.go index cfbbdae1f4..5209012bc5 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute_test.go +++ b/cmd/kubeadm/app/phases/upgrade/compute_test.go @@ -29,7 +29,7 @@ import ( clientsetfake "k8s.io/client-go/kubernetes/fake" "k8s.io/kubernetes/cmd/kubeadm/app/constants" etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" - versionutil "k8s.io/kubernetes/pkg/util/version" + versionutil "k8s.io/apimachinery/pkg/util/version" ) type fakeVersionGetter struct { diff --git a/cmd/kubeadm/app/phases/upgrade/policy.go b/cmd/kubeadm/app/phases/upgrade/policy.go index 25c5d4a203..6af3b2589d 100644 --- a/cmd/kubeadm/app/phases/upgrade/policy.go +++ b/cmd/kubeadm/app/phases/upgrade/policy.go @@ -21,7 +21,7 @@ import ( "strings" "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) const ( diff --git a/cmd/kubeadm/app/phases/upgrade/policy_test.go b/cmd/kubeadm/app/phases/upgrade/policy_test.go index f34c7d3bea..696788d724 100644 --- a/cmd/kubeadm/app/phases/upgrade/policy_test.go +++ b/cmd/kubeadm/app/phases/upgrade/policy_test.go @@ -19,7 +19,7 @@ package upgrade import ( "testing" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) func TestEnforceVersionPolicies(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade.go b/cmd/kubeadm/app/phases/upgrade/postupgrade.go index 08f95268cd..55bad06a2e 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade.go @@ -43,7 +43,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/phases/uploadconfig" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) var expiry = 180 * 24 * time.Hour diff --git a/cmd/kubeadm/app/phases/upgrade/prepull_test.go b/cmd/kubeadm/app/phases/upgrade/prepull_test.go index 2789d8e644..9fd38b77c1 100644 --- a/cmd/kubeadm/app/phases/upgrade/prepull_test.go +++ b/cmd/kubeadm/app/phases/upgrade/prepull_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" "time" - //"k8s.io/kubernetes/pkg/util/version" + //"k8s.io/apimachinery/pkg/util/version" ) // failedCreatePrepuller is a fake prepuller that errors for kube-controller-manager in the CreateFunc call diff --git a/cmd/kubeadm/app/phases/upgrade/selfhosted.go b/cmd/kubeadm/app/phases/upgrade/selfhosted.go index efd37af087..ff057d88fc 100644 --- a/cmd/kubeadm/app/phases/upgrade/selfhosted.go +++ b/cmd/kubeadm/app/phases/upgrade/selfhosted.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/phases/controlplane" "k8s.io/kubernetes/cmd/kubeadm/app/phases/selfhosting" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) const ( diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods.go b/cmd/kubeadm/app/phases/upgrade/staticpods.go index 52cca57815..2d8ed6c4af 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/util" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) const ( diff --git a/cmd/kubeadm/app/phases/upgrade/versiongetter.go b/cmd/kubeadm/app/phases/upgrade/versiongetter.go index d9c9d69aac..06f14f9af3 100644 --- a/cmd/kubeadm/app/phases/upgrade/versiongetter.go +++ b/cmd/kubeadm/app/phases/upgrade/versiongetter.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - versionutil "k8s.io/kubernetes/pkg/util/version" + versionutil "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/pkg/version" ) diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index 4c6a958b30..e450713123 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -49,7 +49,7 @@ import ( "k8s.io/kubernetes/pkg/registry/core/service/ipallocator" "k8s.io/kubernetes/pkg/util/initsystem" ipvsutil "k8s.io/kubernetes/pkg/util/ipvs" - versionutil "k8s.io/kubernetes/pkg/util/version" + versionutil "k8s.io/apimachinery/pkg/util/version" kubeadmversion "k8s.io/kubernetes/pkg/version" utilsexec "k8s.io/utils/exec" ) diff --git a/cmd/kubeadm/app/preflight/utils.go b/cmd/kubeadm/app/preflight/utils.go index 14bae5c6b1..3f94fd76af 100644 --- a/cmd/kubeadm/app/preflight/utils.go +++ b/cmd/kubeadm/app/preflight/utils.go @@ -21,7 +21,7 @@ import ( "regexp" "strings" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" utilsexec "k8s.io/utils/exec" ) diff --git a/cmd/kubeadm/app/util/config/cluster.go b/cmd/kubeadm/app/util/config/cluster.go index 7917381e7c..5551da6bb7 100644 --- a/cmd/kubeadm/app/util/config/cluster.go +++ b/cmd/kubeadm/app/util/config/cluster.go @@ -34,7 +34,7 @@ import ( kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) // FetchConfigFromFileOrCluster fetches configuration required for upgrading your cluster from a file (which has precedence) or a ConfigMap in the cluster diff --git a/cmd/kubeadm/app/util/config/cluster_test.go b/cmd/kubeadm/app/util/config/cluster_test.go index 77ba145f91..106aaf7781 100644 --- a/cmd/kubeadm/app/util/config/cluster_test.go +++ b/cmd/kubeadm/app/util/config/cluster_test.go @@ -31,7 +31,7 @@ import ( kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) var k8sVersionString = "v1.12.0" diff --git a/cmd/kubeadm/app/util/config/common.go b/cmd/kubeadm/app/util/config/common.go index 3573f2e978..8214e2d445 100644 --- a/cmd/kubeadm/app/util/config/common.go +++ b/cmd/kubeadm/app/util/config/common.go @@ -31,7 +31,7 @@ import ( kubeadmapiv1alpha3 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha3" "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) // AnyConfigFileAndDefaultsToInternal reads either a InitConfiguration or JoinConfiguration and unmarshals it diff --git a/cmd/kubeadm/app/util/version.go b/cmd/kubeadm/app/util/version.go index 15cc900e99..98109d7626 100644 --- a/cmd/kubeadm/app/util/version.go +++ b/cmd/kubeadm/app/util/version.go @@ -27,7 +27,7 @@ import ( "github.com/golang/glog" netutil "k8s.io/apimachinery/pkg/util/net" - versionutil "k8s.io/kubernetes/pkg/util/version" + versionutil "k8s.io/apimachinery/pkg/util/version" pkgversion "k8s.io/kubernetes/pkg/version" ) diff --git a/pkg/cloudprovider/providers/gce/gce_healthchecks.go b/pkg/cloudprovider/providers/gce/gce_healthchecks.go index 8dc913a608..6ca577ca9c 100644 --- a/pkg/cloudprovider/providers/gce/gce_healthchecks.go +++ b/pkg/cloudprovider/providers/gce/gce_healthchecks.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/filter" "k8s.io/kubernetes/pkg/cloudprovider/providers/gce/cloud/meta" "k8s.io/kubernetes/pkg/master/ports" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" ) const ( diff --git a/pkg/cloudprovider/providers/vsphere/vsphere_util.go b/pkg/cloudprovider/providers/vsphere/vsphere_util.go index b492b6f1ea..1fb86b6bf4 100644 --- a/pkg/cloudprovider/providers/vsphere/vsphere_util.go +++ b/pkg/cloudprovider/providers/vsphere/vsphere_util.go @@ -35,7 +35,7 @@ import ( k8stypes "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib" "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere/vclib/diskmanagers" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" ) const ( diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 132e2de9ab..b283e68858 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -59,7 +59,7 @@ import ( "k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/util/procfs" utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" ) const ( diff --git a/pkg/kubelet/dockershim/cm/container_manager_linux.go b/pkg/kubelet/dockershim/cm/container_manager_linux.go index 17baaee11e..e2c3048209 100644 --- a/pkg/kubelet/dockershim/cm/container_manager_linux.go +++ b/pkg/kubelet/dockershim/cm/container_manager_linux.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" kubecm "k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/qos" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/pkg/kubelet/dockershim/libdocker" ) diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go index 2818990b11..531188ffdd 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go @@ -46,7 +46,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/pkg/kubelet/util/cache" "k8s.io/kubernetes/pkg/kubelet/util/format" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" ) const ( diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index 41f03d49cd..ea274a697d 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -47,7 +47,7 @@ import ( utiliptables "k8s.io/kubernetes/pkg/util/iptables" utilnet "k8s.io/kubernetes/pkg/util/net" utilsysctl "k8s.io/kubernetes/pkg/util/sysctl" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" utilexec "k8s.io/utils/exec" ) diff --git a/pkg/proxy/ipvs/ipset.go b/pkg/proxy/ipvs/ipset.go index 99bdc6d154..587fe182fb 100644 --- a/pkg/proxy/ipvs/ipset.go +++ b/pkg/proxy/ipvs/ipset.go @@ -19,7 +19,7 @@ package ipvs import ( "k8s.io/apimachinery/pkg/util/sets" utilipset "k8s.io/kubernetes/pkg/util/ipset" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" "fmt" "github.com/golang/glog" diff --git a/pkg/util/iptables/iptables.go b/pkg/util/iptables/iptables.go index 8c9b6722af..1a80b1d7aa 100644 --- a/pkg/util/iptables/iptables.go +++ b/pkg/util/iptables/iptables.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" utiltrace "k8s.io/apiserver/pkg/util/trace" utildbus "k8s.io/kubernetes/pkg/util/dbus" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" utilexec "k8s.io/utils/exec" ) diff --git a/staging/src/k8s.io/apimachinery/pkg/util/version/doc.go b/staging/src/k8s.io/apimachinery/pkg/util/version/doc.go index ebe43152e8..5b2b22b6d0 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/version/doc.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/version/doc.go @@ -15,4 +15,4 @@ limitations under the License. */ // Package version provides utilities for version number comparisons -package version // import "k8s.io/kubernetes/pkg/util/version" +package version // import "k8s.io/apimachinery/pkg/util/version" diff --git a/test/e2e/apimachinery/aggregator.go b/test/e2e/apimachinery/aggregator.go index 173b6f5618..dc6d768427 100644 --- a/test/e2e/apimachinery/aggregator.go +++ b/test/e2e/apimachinery/aggregator.go @@ -39,7 +39,7 @@ import ( apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" aggregatorclient "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset" rbacapi "k8s.io/kubernetes/pkg/apis/rbac" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image" samplev1alpha1 "k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1" diff --git a/test/e2e/apimachinery/custom_resource_definition.go b/test/e2e/apimachinery/custom_resource_definition.go index fea9287e60..fb0469487e 100644 --- a/test/e2e/apimachinery/custom_resource_definition.go +++ b/test/e2e/apimachinery/custom_resource_definition.go @@ -20,7 +20,7 @@ import ( "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apiextensions-apiserver/test/integration/fixtures" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/apimachinery/table_conversion.go b/test/e2e/apimachinery/table_conversion.go index f431bb2894..c4397dfef3 100644 --- a/test/e2e/apimachinery/table_conversion.go +++ b/test/e2e/apimachinery/table_conversion.go @@ -32,7 +32,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/printers" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image" ) diff --git a/test/e2e/apimachinery/webhook.go b/test/e2e/apimachinery/webhook.go index ef942e18ad..9e0da619b9 100644 --- a/test/e2e/apimachinery/webhook.go +++ b/test/e2e/apimachinery/webhook.go @@ -36,7 +36,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic" clientset "k8s.io/client-go/kubernetes" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image" diff --git a/test/e2e/common/downward_api.go b/test/e2e/common/downward_api.go index 2f779e9a77..3776dd0bbc 100644 --- a/test/e2e/common/downward_api.go +++ b/test/e2e/common/downward_api.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image" diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 08b2f21827..d7c4be03ae 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -97,7 +97,7 @@ import ( sshutil "k8s.io/kubernetes/pkg/ssh" "k8s.io/kubernetes/pkg/util/system" taintutils "k8s.io/kubernetes/pkg/util/taints" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" diff --git a/test/e2e/lifecycle/cluster_upgrade.go b/test/e2e/lifecycle/cluster_upgrade.go index c82c7e011c..4e6474bf3b 100644 --- a/test/e2e/lifecycle/cluster_upgrade.go +++ b/test/e2e/lifecycle/cluster_upgrade.go @@ -27,7 +27,7 @@ import ( "time" "k8s.io/client-go/discovery" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/chaosmonkey" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" diff --git a/test/e2e/scheduling/predicates.go b/test/e2e/scheduling/predicates.go index b2aca97c1d..bf6de871c4 100644 --- a/test/e2e/scheduling/predicates.go +++ b/test/e2e/scheduling/predicates.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" clientset "k8s.io/client-go/kubernetes" - utilversion "k8s.io/kubernetes/pkg/util/version" + utilversion "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" diff --git a/test/e2e/storage/flexvolume.go b/test/e2e/storage/flexvolume.go index afda29bf10..c1acecdee2 100644 --- a/test/e2e/storage/flexvolume.go +++ b/test/e2e/storage/flexvolume.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/version" clientset "k8s.io/client-go/kubernetes" - versionutil "k8s.io/kubernetes/pkg/util/version" + versionutil "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/generated" "k8s.io/kubernetes/test/e2e/storage/utils" diff --git a/test/e2e/upgrades/apps/statefulset.go b/test/e2e/upgrades/apps/statefulset.go index 83884e3566..ce0abe0c40 100644 --- a/test/e2e/upgrades/apps/statefulset.go +++ b/test/e2e/upgrades/apps/statefulset.go @@ -22,7 +22,7 @@ import ( apps "k8s.io/api/apps/v1" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/upgrades" diff --git a/test/e2e/upgrades/cassandra.go b/test/e2e/upgrades/cassandra.go index b96a6d3eb7..2bc12a86da 100644 --- a/test/e2e/upgrades/cassandra.go +++ b/test/e2e/upgrades/cassandra.go @@ -30,7 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/e2e/upgrades/etcd.go b/test/e2e/upgrades/etcd.go index aea9e08ec6..4f04689caa 100644 --- a/test/e2e/upgrades/etcd.go +++ b/test/e2e/upgrades/etcd.go @@ -30,7 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/e2e/upgrades/ingress.go b/test/e2e/upgrades/ingress.go index 855e8dcabf..132bb44997 100644 --- a/test/e2e/upgrades/ingress.go +++ b/test/e2e/upgrades/ingress.go @@ -29,7 +29,7 @@ import ( compute "google.golang.org/api/compute/v1" extensions "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/e2e/upgrades/mysql.go b/test/e2e/upgrades/mysql.go index 606032aa64..1b4bad4aae 100644 --- a/test/e2e/upgrades/mysql.go +++ b/test/e2e/upgrades/mysql.go @@ -30,7 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/e2e/upgrades/upgrade.go b/test/e2e/upgrades/upgrade.go index 11eeadb0fa..420feb8ce7 100644 --- a/test/e2e/upgrades/upgrade.go +++ b/test/e2e/upgrades/upgrade.go @@ -19,7 +19,7 @@ limitations under the License. package upgrades import ( - "k8s.io/kubernetes/pkg/util/version" + "k8s.io/apimachinery/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/test_owners.csv b/test/test_owners.csv index 909fe148a8..8ac4a86ba2 100644 --- a/test/test_owners.csv +++ b/test/test_owners.csv @@ -809,7 +809,7 @@ k8s.io/kubernetes/pkg/util/tail,zmerlynn,1, k8s.io/kubernetes/pkg/util/taints,rrati,0, k8s.io/kubernetes/pkg/util/term,davidopp,1, k8s.io/kubernetes/pkg/util/threading,roberthbailey,1, -k8s.io/kubernetes/pkg/util/version,danwinship,0, +k8s.io/apimachinery/pkg/util/version,danwinship,0, k8s.io/kubernetes/pkg/volume,saad-ali,0, k8s.io/kubernetes/pkg/volume/aws_ebs,caesarxuchao,1, k8s.io/kubernetes/pkg/volume/azure_dd,bgrant0607,1,