From 72fd01095de9653c1a54e6dcb5405db8dd309010 Mon Sep 17 00:00:00 2001 From: XinYang Date: Tue, 17 Aug 2021 22:40:46 +0800 Subject: [PATCH] re-order imports for kubeadm Signed-off-by: XinYang --- .../app/apis/bootstraptoken/v1/utils_test.go | 1 + cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go | 8 +++--- .../app/apis/kubeadm/fuzzer/fuzzer_test.go | 4 +-- cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go | 8 +++--- cmd/kubeadm/app/apis/kubeadm/types.go | 4 +-- .../kubeadm/v1beta2/bootstraptokenstring.go | 4 +-- .../app/apis/kubeadm/v1beta2/conversion.go | 4 +-- .../app/apis/kubeadm/v1beta2/defaults.go | 4 +-- .../app/apis/kubeadm/v1beta3/conversion.go | 4 +-- .../app/apis/kubeadm/v1beta3/defaults.go | 6 ++-- cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go | 1 + .../app/apis/kubeadm/validation/validation.go | 20 ++++++------- .../kubeadm/validation/validation_test.go | 8 +++--- cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go | 6 ++-- .../app/apis/output/fuzzer/fuzzer_test.go | 4 +-- cmd/kubeadm/app/apis/output/scheme/scheme.go | 6 ++-- cmd/kubeadm/app/apis/output/types.go | 4 +-- cmd/kubeadm/app/apis/output/v1alpha1/types.go | 4 +-- cmd/kubeadm/app/cmd/certs.go | 14 +++++----- cmd/kubeadm/app/cmd/certs_test.go | 14 +++++----- cmd/kubeadm/app/cmd/cmd.go | 8 ++---- cmd/kubeadm/app/cmd/completion.go | 4 +-- cmd/kubeadm/app/cmd/config.go | 20 ++++++------- cmd/kubeadm/app/cmd/config_test.go | 12 ++++---- cmd/kubeadm/app/cmd/init.go | 16 +++++------ cmd/kubeadm/app/cmd/init_test.go | 4 +-- cmd/kubeadm/app/cmd/join.go | 22 +++++++-------- cmd/kubeadm/app/cmd/join_test.go | 4 +-- cmd/kubeadm/app/cmd/kubeconfig.go | 8 +++--- cmd/kubeadm/app/cmd/kubeconfig_test.go | 8 +++--- cmd/kubeadm/app/cmd/options/generic.go | 6 ++-- cmd/kubeadm/app/cmd/options/token.go | 8 +++--- cmd/kubeadm/app/cmd/phases/init/addons.go | 8 +++--- .../app/cmd/phases/init/bootstraptoken.go | 4 +-- cmd/kubeadm/app/cmd/phases/init/certs.go | 4 +-- cmd/kubeadm/app/cmd/phases/init/certs_test.go | 4 +-- .../app/cmd/phases/init/controlplane.go | 4 +-- cmd/kubeadm/app/cmd/phases/init/data.go | 4 +-- cmd/kubeadm/app/cmd/phases/init/data_test.go | 4 +-- cmd/kubeadm/app/cmd/phases/init/etcd.go | 8 +++--- cmd/kubeadm/app/cmd/phases/init/kubeconfig.go | 4 +-- cmd/kubeadm/app/cmd/phases/init/kubelet.go | 8 +++--- .../app/cmd/phases/init/kubeletfinalize.go | 10 +++---- .../app/cmd/phases/init/markcontrolplane.go | 4 +-- cmd/kubeadm/app/cmd/phases/init/preflight.go | 8 +++--- .../app/cmd/phases/init/uploadcerts.go | 4 +-- .../app/cmd/phases/init/uploadconfig.go | 12 ++++---- .../app/cmd/phases/init/waitcontrolplane.go | 12 ++++---- cmd/kubeadm/app/cmd/phases/join/checketcd.go | 4 +-- .../app/cmd/phases/join/controlplanejoin.go | 6 ++-- .../cmd/phases/join/controlplaneprepare.go | 12 ++++---- cmd/kubeadm/app/cmd/phases/join/data.go | 4 +-- cmd/kubeadm/app/cmd/phases/join/data_test.go | 4 +-- cmd/kubeadm/app/cmd/phases/join/kubelet.go | 22 +++++++-------- cmd/kubeadm/app/cmd/phases/join/preflight.go | 12 ++++---- .../app/cmd/phases/reset/cleanupnode.go | 6 ++-- .../app/cmd/phases/reset/cleanupnode_test.go | 6 ++-- cmd/kubeadm/app/cmd/phases/reset/data.go | 4 +-- .../app/cmd/phases/reset/removeetcdmember.go | 4 +-- .../cmd/phases/reset/removeetcdmember_test.go | 4 +-- .../cmd/phases/upgrade/node/controlplane.go | 4 +-- .../app/cmd/phases/upgrade/node/data.go | 4 +-- .../cmd/phases/upgrade/node/kubeletconfig.go | 4 +-- .../app/cmd/phases/upgrade/node/preflight.go | 8 +++--- cmd/kubeadm/app/cmd/phases/util.go | 4 +-- cmd/kubeadm/app/cmd/phases/util_test.go | 4 +-- cmd/kubeadm/app/cmd/reset.go | 16 +++++------ cmd/kubeadm/app/cmd/token.go | 28 +++++++++---------- cmd/kubeadm/app/cmd/token_test.go | 14 +++++----- cmd/kubeadm/app/cmd/upgrade/apply.go | 18 ++++++------ cmd/kubeadm/app/cmd/upgrade/common.go | 18 ++++++------ cmd/kubeadm/app/cmd/upgrade/diff.go | 18 ++++++------ cmd/kubeadm/app/cmd/upgrade/diff_test.go | 4 +-- cmd/kubeadm/app/cmd/upgrade/node.go | 14 +++++----- cmd/kubeadm/app/cmd/upgrade/plan.go | 16 +++++------ cmd/kubeadm/app/cmd/upgrade/upgrade.go | 6 ++-- cmd/kubeadm/app/cmd/util/cmdutil.go | 12 ++++---- cmd/kubeadm/app/cmd/util/join.go | 6 ++-- cmd/kubeadm/app/cmd/version.go | 6 ++-- cmd/kubeadm/app/cmd/version_test.go | 4 +-- cmd/kubeadm/app/componentconfigs/checksums.go | 4 +-- .../app/componentconfigs/checksums_test.go | 4 +-- cmd/kubeadm/app/componentconfigs/configset.go | 10 +++---- .../app/componentconfigs/configset_test.go | 8 +++--- .../app/componentconfigs/fakeconfig_test.go | 14 +++++----- cmd/kubeadm/app/componentconfigs/kubelet.go | 12 ++++---- .../app/componentconfigs/kubelet_test.go | 10 +++---- cmd/kubeadm/app/componentconfigs/kubeproxy.go | 6 ++-- .../app/componentconfigs/kubeproxy_test.go | 10 +++---- cmd/kubeadm/app/constants/constants.go | 4 +-- cmd/kubeadm/app/discovery/discovery.go | 10 +++---- cmd/kubeadm/app/discovery/discovery_test.go | 4 +-- cmd/kubeadm/app/discovery/file/file.go | 6 ++-- cmd/kubeadm/app/discovery/https/https.go | 4 +-- cmd/kubeadm/app/discovery/token/token.go | 14 +++++----- cmd/kubeadm/app/discovery/token/token_test.go | 6 ++-- cmd/kubeadm/app/features/features.go | 4 +-- cmd/kubeadm/app/images/images.go | 4 +-- cmd/kubeadm/app/kubeadm.go | 4 +-- cmd/kubeadm/app/phases/addons/dns/dns.go | 16 +++++------ cmd/kubeadm/app/phases/addons/dns/dns_test.go | 6 ++-- cmd/kubeadm/app/phases/addons/proxy/proxy.go | 14 +++++----- .../app/phases/addons/proxy/proxy_test.go | 8 +++--- .../bootstraptoken/clusterinfo/clusterinfo.go | 4 +-- .../bootstraptoken/node/tlsbootstrap.go | 6 ++-- .../app/phases/bootstraptoken/node/token.go | 6 ++-- cmd/kubeadm/app/phases/certs/certlist.go | 8 +++--- cmd/kubeadm/app/phases/certs/certlist_test.go | 4 +-- cmd/kubeadm/app/phases/certs/certs.go | 8 +++--- cmd/kubeadm/app/phases/certs/certs_test.go | 12 ++++---- .../phases/certs/renewal/filerenewer_test.go | 4 +-- .../app/phases/certs/renewal/manager.go | 8 +++--- .../app/phases/certs/renewal/manager_test.go | 4 +-- .../app/phases/certs/renewal/readwriter.go | 6 ++-- .../phases/certs/renewal/readwriter_test.go | 8 +++--- .../app/phases/controlplane/manifests.go | 12 ++++---- .../app/phases/controlplane/manifests_test.go | 8 +++--- .../app/phases/controlplane/volumes.go | 6 ++-- .../app/phases/controlplane/volumes_test.go | 4 +-- cmd/kubeadm/app/phases/copycerts/copycerts.go | 14 +++++----- .../app/phases/copycerts/copycerts_test.go | 12 ++++---- cmd/kubeadm/app/phases/etcd/local.go | 16 +++++------ cmd/kubeadm/app/phases/etcd/local_test.go | 4 +-- .../app/phases/kubeconfig/kubeconfig.go | 14 +++++----- .../app/phases/kubeconfig/kubeconfig_test.go | 10 +++---- cmd/kubeadm/app/phases/kubelet/config.go | 10 +++---- cmd/kubeadm/app/phases/kubelet/config_test.go | 4 +-- cmd/kubeadm/app/phases/kubelet/flags.go | 8 +++--- cmd/kubeadm/app/phases/kubelet/flags_test.go | 4 +-- .../markcontrolplane/markcontrolplane.go | 6 ++-- .../markcontrolplane/markcontrolplane_test.go | 4 +-- cmd/kubeadm/app/phases/patchnode/patchnode.go | 6 ++-- .../app/phases/patchnode/patchnode_test.go | 4 +-- cmd/kubeadm/app/phases/upgrade/compute.go | 6 ++-- .../app/phases/upgrade/compute_test.go | 4 +-- cmd/kubeadm/app/phases/upgrade/health.go | 10 +++---- cmd/kubeadm/app/phases/upgrade/policy.go | 4 +-- cmd/kubeadm/app/phases/upgrade/postupgrade.go | 20 ++++++------- .../app/phases/upgrade/postupgrade_test.go | 4 +-- cmd/kubeadm/app/phases/upgrade/preflight.go | 10 +++---- cmd/kubeadm/app/phases/upgrade/staticpods.go | 14 +++++----- .../app/phases/upgrade/staticpods_test.go | 12 ++++---- .../app/phases/upgrade/versiongetter.go | 4 +-- .../app/phases/uploadconfig/uploadconfig.go | 10 +++---- .../phases/uploadconfig/uploadconfig_test.go | 8 +++--- cmd/kubeadm/app/preflight/checks.go | 14 +++++----- cmd/kubeadm/app/preflight/checks_test.go | 10 +++---- cmd/kubeadm/app/preflight/utils.go | 4 +-- cmd/kubeadm/app/preflight/utils_test.go | 4 +-- .../app/util/apiclient/clientbacked_dryrun.go | 4 +-- .../app/util/apiclient/dryrunclient.go | 4 +-- cmd/kubeadm/app/util/apiclient/idempotency.go | 4 +-- .../app/util/apiclient/idempotency_test.go | 4 +-- cmd/kubeadm/app/util/apiclient/init_dryrun.go | 4 +-- cmd/kubeadm/app/util/apiclient/wait.go | 4 +-- cmd/kubeadm/app/util/certs/util.go | 4 +-- cmd/kubeadm/app/util/config/cluster.go | 14 +++++----- cmd/kubeadm/app/util/config/cluster_test.go | 14 +++++----- cmd/kubeadm/app/util/config/common.go | 12 ++++---- cmd/kubeadm/app/util/config/common_test.go | 10 +++---- .../app/util/config/initconfiguration.go | 18 ++++++------ .../app/util/config/initconfiguration_test.go | 6 ++-- .../app/util/config/joinconfiguration.go | 10 +++---- .../app/util/config/joinconfiguration_test.go | 4 +-- cmd/kubeadm/app/util/config/strict/strict.go | 6 ++-- .../app/util/config/strict/strict_test.go | 6 ++-- cmd/kubeadm/app/util/crypto/crypto_test.go | 4 +-- cmd/kubeadm/app/util/dryrun/dryrun.go | 6 ++-- cmd/kubeadm/app/util/endpoint.go | 4 +-- cmd/kubeadm/app/util/etcd/etcd.go | 16 +++++------ cmd/kubeadm/app/util/etcd/etcd_test.go | 8 +++--- cmd/kubeadm/app/util/kubeconfig/kubeconfig.go | 4 +-- cmd/kubeadm/app/util/marshal.go | 6 ++-- cmd/kubeadm/app/util/marshal_test.go | 10 +++---- cmd/kubeadm/app/util/output/output.go | 4 +-- cmd/kubeadm/app/util/patches/patches.go | 6 ++-- cmd/kubeadm/app/util/patches/patches_test.go | 4 +-- cmd/kubeadm/app/util/pkiutil/pki_helpers.go | 10 +++---- .../app/util/pkiutil/pki_helpers_test.go | 4 +-- cmd/kubeadm/app/util/runtime/runtime.go | 4 +-- cmd/kubeadm/app/util/runtime/runtime_test.go | 4 +-- cmd/kubeadm/app/util/staticpod/utils.go | 12 ++++---- cmd/kubeadm/app/util/staticpod/utils_linux.go | 10 +++---- .../app/util/staticpod/utils_linux_test.go | 6 ++-- .../app/util/staticpod/utils_others.go | 4 +-- cmd/kubeadm/app/util/staticpod/utils_test.go | 6 ++-- cmd/kubeadm/app/util/users/users_linux.go | 4 +-- cmd/kubeadm/app/util/version.go | 4 +-- cmd/kubeadm/test/cmd/init_test.go | 4 +-- cmd/kubeadm/test/kubeconfig/util.go | 4 +-- cmd/kubeadm/test/resources/configmap.go | 4 +-- cmd/kubeadm/test/resources/pods.go | 4 +-- 192 files changed, 737 insertions(+), 737 deletions(-) diff --git a/cmd/kubeadm/app/apis/bootstraptoken/v1/utils_test.go b/cmd/kubeadm/app/apis/bootstraptoken/v1/utils_test.go index 9a12ded26c5..490869c91f0 100644 --- a/cmd/kubeadm/app/apis/bootstraptoken/v1/utils_test.go +++ b/cmd/kubeadm/app/apis/bootstraptoken/v1/utils_test.go @@ -23,6 +23,7 @@ import ( "time" "github.com/pkg/errors" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go index b96e5f39b26..ad8b0a90857 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer.go @@ -17,15 +17,15 @@ limitations under the License. package fuzzer import ( - bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" + fuzz "github.com/google/gofuzz" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" - fuzz "github.com/google/gofuzz" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) // Funcs returns the fuzzer functions for the kubeadm apis. diff --git a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer_test.go b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer_test.go index 953eb856c64..5baee0bb7c9 100644 --- a/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer_test.go +++ b/cmd/kubeadm/app/apis/kubeadm/fuzzer/fuzzer_test.go @@ -19,9 +19,9 @@ package fuzzer import ( "testing" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" - "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" + + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" ) func TestRoundTripTypes(t *testing.T) { diff --git a/cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go b/cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go index 202fe940d65..1e250937772 100644 --- a/cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go +++ b/cmd/kubeadm/app/apis/kubeadm/scheme/scheme.go @@ -17,15 +17,15 @@ limitations under the License. package scheme import ( - "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" ) // Scheme is the runtime.Scheme to which all kubeadm api types are registered. diff --git a/cmd/kubeadm/app/apis/kubeadm/types.go b/cmd/kubeadm/app/apis/kubeadm/types.go index 195f4f2e501..954b2a38596 100644 --- a/cmd/kubeadm/app/apis/kubeadm/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/types.go @@ -19,12 +19,12 @@ package kubeadm import ( "crypto/x509" - "k8s.io/kubernetes/cmd/kubeadm/app/features" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" + "k8s.io/kubernetes/cmd/kubeadm/app/features" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta2/bootstraptokenstring.go b/cmd/kubeadm/app/apis/kubeadm/v1beta2/bootstraptokenstring.go index 40844f76d8e..f6f42e9342e 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta2/bootstraptokenstring.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta2/bootstraptokenstring.go @@ -20,10 +20,10 @@ import ( "fmt" "strings" + "github.com/pkg/errors" + bootstrapapi "k8s.io/cluster-bootstrap/token/api" bootstraputil "k8s.io/cluster-bootstrap/token/util" - - "github.com/pkg/errors" ) // BootstrapTokenString is a token of the format abcdef.abcdef0123456789 that is used diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta2/conversion.go b/cmd/kubeadm/app/apis/kubeadm/v1beta2/conversion.go index 95c04d85e1e..d5c2243b983 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta2/conversion.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta2/conversion.go @@ -17,10 +17,10 @@ limitations under the License. package v1beta2 import ( - kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - corev1 "k8s.io/api/core/v1" conversion "k8s.io/apimachinery/pkg/conversion" + + kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) func Convert_kubeadm_InitConfiguration_To_v1beta2_InitConfiguration(in *kubeadm.InitConfiguration, out *InitConfiguration, s conversion.Scope) error { diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go index 2611da7be9c..06bf93761fc 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta2/defaults.go @@ -20,10 +20,10 @@ import ( "net/url" "time" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) const ( diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go index 595711f64c1..81497856f50 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/conversion.go @@ -17,9 +17,9 @@ limitations under the License. package v1beta3 import ( - kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - conversion "k8s.io/apimachinery/pkg/conversion" + + kubeadm "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) func Convert_kubeadm_InitConfiguration_To_v1beta3_InitConfiguration(in *kubeadm.InitConfiguration, out *InitConfiguration, s conversion.Scope) error { diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go index feb72d7807e..193686b0981 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/defaults.go @@ -20,12 +20,12 @@ import ( "net/url" "time" - bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) const ( diff --git a/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go b/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go index 484fc1790a5..765ec8c740e 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1beta3/types.go @@ -19,6 +19,7 @@ package v1beta3 import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" ) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go index dc7b0d44300..37001d9d7ef 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go @@ -25,14 +25,8 @@ import ( "strconv" "strings" - bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - kubeadmcmdoptions "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" - "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/features" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "github.com/pkg/errors" + "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" @@ -42,8 +36,14 @@ import ( "k8s.io/klog/v2" utilnet "k8s.io/utils/net" - "github.com/pkg/errors" - "github.com/spf13/pflag" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + kubeadmcmdoptions "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" + "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/features" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" ) // ValidateInitConfiguration validates an InitConfiguration object and collects all encountered errors diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go index f04aebd882f..b40735c74db 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation_test.go @@ -21,14 +21,14 @@ import ( "os" "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/features" + "github.com/spf13/pflag" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation/field" - "github.com/spf13/pflag" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/features" ) func TestValidateToken(t *testing.T) { diff --git a/cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go b/cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go index 0fb52072266..b4374b6e0ed 100644 --- a/cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go +++ b/cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go @@ -19,13 +19,13 @@ package fuzzer import ( "time" - kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/output" + fuzz "github.com/google/gofuzz" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" - fuzz "github.com/google/gofuzz" + kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/output" ) // Funcs returns the fuzzer functions for the kubeadm apis. diff --git a/cmd/kubeadm/app/apis/output/fuzzer/fuzzer_test.go b/cmd/kubeadm/app/apis/output/fuzzer/fuzzer_test.go index 07cfe6de6e6..56044dc7122 100644 --- a/cmd/kubeadm/app/apis/output/fuzzer/fuzzer_test.go +++ b/cmd/kubeadm/app/apis/output/fuzzer/fuzzer_test.go @@ -19,9 +19,9 @@ package fuzzer import ( "testing" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/scheme" - "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" + + "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/scheme" ) func TestRoundTripTypes(t *testing.T) { diff --git a/cmd/kubeadm/app/apis/output/scheme/scheme.go b/cmd/kubeadm/app/apis/output/scheme/scheme.go index 280c07487d9..4719e81921f 100644 --- a/cmd/kubeadm/app/apis/output/scheme/scheme.go +++ b/cmd/kubeadm/app/apis/output/scheme/scheme.go @@ -17,14 +17,14 @@ limitations under the License. package scheme import ( - "k8s.io/kubernetes/cmd/kubeadm/app/apis/output" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/v1alpha1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + + "k8s.io/kubernetes/cmd/kubeadm/app/apis/output" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/v1alpha1" ) // Scheme is the runtime.Scheme to which all kubeadm api types are registered. diff --git a/cmd/kubeadm/app/apis/output/types.go b/cmd/kubeadm/app/apis/output/types.go index f6da66beefc..b1a319a58df 100644 --- a/cmd/kubeadm/app/apis/output/types.go +++ b/cmd/kubeadm/app/apis/output/types.go @@ -17,9 +17,9 @@ limitations under the License. package output import ( - kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/cmd/kubeadm/app/apis/output/v1alpha1/types.go b/cmd/kubeadm/app/apis/output/v1alpha1/types.go index 7812eb83fd2..5a2f3a262a3 100644 --- a/cmd/kubeadm/app/apis/output/v1alpha1/types.go +++ b/cmd/kubeadm/app/apis/output/v1alpha1/types.go @@ -17,9 +17,9 @@ limitations under the License. package v1alpha1 import ( - kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/cmd/kubeadm/app/cmd/certs.go b/cmd/kubeadm/app/cmd/certs.go index 5d66bb36c65..0d4635341b7 100644 --- a/cmd/kubeadm/app/cmd/certs.go +++ b/cmd/kubeadm/app/cmd/certs.go @@ -21,6 +21,13 @@ import ( "io" "text/tabwriter" + "github.com/lithammer/dedent" + "github.com/pkg/errors" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + + "k8s.io/apimachinery/pkg/util/duration" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" @@ -33,13 +40,6 @@ import ( kubeconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - - "k8s.io/apimachinery/pkg/util/duration" - - "github.com/lithammer/dedent" - "github.com/pkg/errors" - "github.com/spf13/cobra" - "github.com/spf13/pflag" ) var ( diff --git a/cmd/kubeadm/app/cmd/certs_test.go b/cmd/kubeadm/app/cmd/certs_test.go index 2f8cf22814a..32fbccbb483 100644 --- a/cmd/kubeadm/app/cmd/certs_test.go +++ b/cmd/kubeadm/app/cmd/certs_test.go @@ -26,6 +26,13 @@ import ( "testing" "time" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "k8s.io/client-go/tools/clientcmd" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" @@ -34,13 +41,6 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" cmdtestutil "k8s.io/kubernetes/cmd/kubeadm/test/cmd" - - "k8s.io/client-go/tools/clientcmd" - - "github.com/spf13/cobra" - "github.com/spf13/pflag" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) func TestCommandsGenerated(t *testing.T) { diff --git a/cmd/kubeadm/app/cmd/cmd.go b/cmd/kubeadm/app/cmd/cmd.go index e330c835123..0a0729d7696 100644 --- a/cmd/kubeadm/app/cmd/cmd.go +++ b/cmd/kubeadm/app/cmd/cmd.go @@ -19,15 +19,13 @@ package cmd import ( "io" + "github.com/lithammer/dedent" + "github.com/spf13/cobra" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/alpha" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/upgrade" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - // Register the kubeadm configuration types because CLI flag generation - // depends on the generated defaults. - - "github.com/lithammer/dedent" - "github.com/spf13/cobra" ) // NewKubeadmCommand returns cobra.Command to run kubeadm command diff --git a/cmd/kubeadm/app/cmd/completion.go b/cmd/kubeadm/app/cmd/completion.go index 89c34ffb44b..22067ade00a 100644 --- a/cmd/kubeadm/app/cmd/completion.go +++ b/cmd/kubeadm/app/cmd/completion.go @@ -20,11 +20,11 @@ import ( "bytes" "io" - "k8s.io/klog/v2" - "github.com/lithammer/dedent" "github.com/pkg/errors" "github.com/spf13/cobra" + + "k8s.io/klog/v2" ) const defaultBoilerPlate = ` diff --git a/cmd/kubeadm/app/cmd/config.go b/cmd/kubeadm/app/cmd/config.go index 71f277b4e2e..ce0ed16f62e 100644 --- a/cmd/kubeadm/app/cmd/config.go +++ b/cmd/kubeadm/app/cmd/config.go @@ -24,6 +24,16 @@ import ( "sort" "strings" + "github.com/lithammer/dedent" + "github.com/pkg/errors" + "github.com/spf13/cobra" + flag "github.com/spf13/pflag" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/cli-runtime/pkg/genericclioptions" + utilsexec "k8s.io/utils/exec" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" @@ -38,16 +48,6 @@ import ( configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" "k8s.io/kubernetes/cmd/kubeadm/app/util/output" utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/cli-runtime/pkg/genericclioptions" - utilsexec "k8s.io/utils/exec" - - "github.com/lithammer/dedent" - "github.com/pkg/errors" - "github.com/spf13/cobra" - flag "github.com/spf13/pflag" ) // newCmdConfig returns cobra.Command for "kubeadm config" command diff --git a/cmd/kubeadm/app/cmd/config_test.go b/cmd/kubeadm/app/cmd/config_test.go index 8477fcec644..10facfd16c6 100644 --- a/cmd/kubeadm/app/cmd/config_test.go +++ b/cmd/kubeadm/app/cmd/config_test.go @@ -29,6 +29,12 @@ import ( "testing" "text/template" + "github.com/lithammer/dedent" + "github.com/spf13/cobra" + + "k8s.io/utils/exec" + fakeexec "k8s.io/utils/exec/testing" + kubeadmapiv1old "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" outputapischeme "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/scheme" @@ -37,12 +43,6 @@ import ( configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" "k8s.io/kubernetes/cmd/kubeadm/app/util/output" utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" - - "k8s.io/utils/exec" - fakeexec "k8s.io/utils/exec/testing" - - "github.com/lithammer/dedent" - "github.com/spf13/cobra" ) const ( diff --git a/cmd/kubeadm/app/cmd/init.go b/cmd/kubeadm/app/cmd/init.go index 37a1ac0b7a9..f010d565f72 100644 --- a/cmd/kubeadm/app/cmd/init.go +++ b/cmd/kubeadm/app/cmd/init.go @@ -23,6 +23,14 @@ import ( "path/filepath" "text/template" + "github.com/lithammer/dedent" + "github.com/pkg/errors" + "github.com/spf13/cobra" + flag "github.com/spf13/pflag" + + "k8s.io/apimachinery/pkg/util/sets" + clientset "k8s.io/client-go/kubernetes" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" @@ -38,14 +46,6 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - - "k8s.io/apimachinery/pkg/util/sets" - clientset "k8s.io/client-go/kubernetes" - - "github.com/lithammer/dedent" - "github.com/pkg/errors" - "github.com/spf13/cobra" - flag "github.com/spf13/pflag" ) var ( diff --git a/cmd/kubeadm/app/cmd/init_test.go b/cmd/kubeadm/app/cmd/init_test.go index e0cd662e058..54a75d0e907 100644 --- a/cmd/kubeadm/app/cmd/init_test.go +++ b/cmd/kubeadm/app/cmd/init_test.go @@ -23,10 +23,10 @@ import ( "path/filepath" "testing" + "k8s.io/apimachinery/pkg/util/sets" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" - - "k8s.io/apimachinery/pkg/util/sets" ) var testInitConfig = fmt.Sprintf(`--- diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go index a965407e8e7..934a0951ff3 100644 --- a/cmd/kubeadm/app/cmd/join.go +++ b/cmd/kubeadm/app/cmd/join.go @@ -24,6 +24,17 @@ import ( "strings" "text/template" + "github.com/lithammer/dedent" + "github.com/pkg/errors" + "github.com/spf13/cobra" + flag "github.com/spf13/pflag" + + "k8s.io/apimachinery/pkg/util/sets" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/client-go/tools/clientcmd" + clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" @@ -36,17 +47,6 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/discovery" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - - "k8s.io/apimachinery/pkg/util/sets" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/client-go/tools/clientcmd" - clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - "k8s.io/klog/v2" - - "github.com/lithammer/dedent" - "github.com/pkg/errors" - "github.com/spf13/cobra" - flag "github.com/spf13/pflag" ) var ( diff --git a/cmd/kubeadm/app/cmd/join_test.go b/cmd/kubeadm/app/cmd/join_test.go index d644f5c77f7..52abea50482 100644 --- a/cmd/kubeadm/app/cmd/join_test.go +++ b/cmd/kubeadm/app/cmd/join_test.go @@ -23,11 +23,11 @@ import ( "path/filepath" "testing" + "k8s.io/apimachinery/pkg/util/sets" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - - "k8s.io/apimachinery/pkg/util/sets" ) var testJoinConfig = fmt.Sprintf(`apiVersion: %s diff --git a/cmd/kubeadm/app/cmd/kubeconfig.go b/cmd/kubeadm/app/cmd/kubeconfig.go index 555b536b8c3..81bc6896a08 100644 --- a/cmd/kubeadm/app/cmd/kubeconfig.go +++ b/cmd/kubeadm/app/cmd/kubeconfig.go @@ -20,16 +20,16 @@ import ( "io" "time" + "github.com/spf13/cobra" + + "k8s.io/klog/v2" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" - - "k8s.io/klog/v2" - - "github.com/spf13/cobra" ) var ( diff --git a/cmd/kubeadm/app/cmd/kubeconfig_test.go b/cmd/kubeadm/app/cmd/kubeconfig_test.go index b9dc952512b..adb5d91dc5b 100644 --- a/cmd/kubeadm/app/cmd/kubeconfig_test.go +++ b/cmd/kubeadm/app/cmd/kubeconfig_test.go @@ -24,15 +24,15 @@ import ( "path/filepath" "testing" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/tools/clientcmd" + "sigs.k8s.io/yaml" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" kubeconfigtestutil "k8s.io/kubernetes/cmd/kubeadm/test/kubeconfig" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/tools/clientcmd" - "sigs.k8s.io/yaml" ) func generateTestKubeadmConfig(dir, id, certDir, clusterName string) (string, error) { diff --git a/cmd/kubeadm/app/cmd/options/generic.go b/cmd/kubeadm/app/cmd/options/generic.go index 9d1d9b672ec..debe6f95ddc 100644 --- a/cmd/kubeadm/app/cmd/options/generic.go +++ b/cmd/kubeadm/app/cmd/options/generic.go @@ -19,12 +19,12 @@ package options import ( "strings" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/features" + "github.com/spf13/pflag" cliflag "k8s.io/component-base/cli/flag" - "github.com/spf13/pflag" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/features" ) // AddKubeConfigFlag adds the --kubeconfig flag to the given flagset diff --git a/cmd/kubeadm/app/cmd/options/token.go b/cmd/kubeadm/app/cmd/options/token.go index 87f5dc4e560..19e24ab6615 100644 --- a/cmd/kubeadm/app/cmd/options/token.go +++ b/cmd/kubeadm/app/cmd/options/token.go @@ -20,13 +20,13 @@ import ( "fmt" "strings" - bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/spf13/pflag" bootstrapapi "k8s.io/cluster-bootstrap/token/api" - "github.com/spf13/pflag" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) // NewBootstrapTokenOptions creates a new BootstrapTokenOptions object with the default values diff --git a/cmd/kubeadm/app/cmd/phases/init/addons.go b/cmd/kubeadm/app/cmd/phases/init/addons.go index 740dfc446a5..8ae777816a9 100644 --- a/cmd/kubeadm/app/cmd/phases/init/addons.go +++ b/cmd/kubeadm/app/cmd/phases/init/addons.go @@ -17,16 +17,16 @@ limitations under the License. package phases import ( + "github.com/pkg/errors" + + clientset "k8s.io/client-go/kubernetes" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" dnsaddon "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns" proxyaddon "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/proxy" - - clientset "k8s.io/client-go/kubernetes" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go b/cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go index 396e79dcff6..b89001063ad 100644 --- a/cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go +++ b/cmd/kubeadm/app/cmd/phases/init/bootstraptoken.go @@ -19,13 +19,13 @@ package phases import ( "fmt" + "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" clusterinfophase "k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo" nodebootstraptokenphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/node" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/certs.go b/cmd/kubeadm/app/cmd/phases/init/certs.go index dfce6d711b4..e2000891fa2 100644 --- a/cmd/kubeadm/app/cmd/phases/init/certs.go +++ b/cmd/kubeadm/app/cmd/phases/init/certs.go @@ -22,6 +22,8 @@ import ( "path/filepath" "strings" + "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" @@ -31,8 +33,6 @@ import ( kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/certs_test.go b/cmd/kubeadm/app/cmd/phases/init/certs_test.go index 691d3cf0cc2..902a00d66d7 100644 --- a/cmd/kubeadm/app/cmd/phases/init/certs_test.go +++ b/cmd/kubeadm/app/cmd/phases/init/certs_test.go @@ -20,13 +20,13 @@ import ( "os" "testing" + "github.com/spf13/cobra" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" pkiutiltesting "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil/testing" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - - "github.com/spf13/cobra" ) type testCertsData struct { diff --git a/cmd/kubeadm/app/cmd/phases/init/controlplane.go b/cmd/kubeadm/app/cmd/phases/init/controlplane.go index b13b4d2cd53..e69194e60d1 100644 --- a/cmd/kubeadm/app/cmd/phases/init/controlplane.go +++ b/cmd/kubeadm/app/cmd/phases/init/controlplane.go @@ -19,13 +19,13 @@ package phases import ( "fmt" + "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/phases/controlplane" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/data.go b/cmd/kubeadm/app/cmd/phases/init/data.go index 4784e1cf9a4..5942593b4ea 100644 --- a/cmd/kubeadm/app/cmd/phases/init/data.go +++ b/cmd/kubeadm/app/cmd/phases/init/data.go @@ -19,10 +19,10 @@ package phases import ( "io" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) // InitData is the interface to use for init phases. diff --git a/cmd/kubeadm/app/cmd/phases/init/data_test.go b/cmd/kubeadm/app/cmd/phases/init/data_test.go index ac9a7d39bff..f7a67445646 100644 --- a/cmd/kubeadm/app/cmd/phases/init/data_test.go +++ b/cmd/kubeadm/app/cmd/phases/init/data_test.go @@ -19,10 +19,10 @@ package phases import ( "io" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) // a package local type for testing purposes. diff --git a/cmd/kubeadm/app/cmd/phases/init/etcd.go b/cmd/kubeadm/app/cmd/phases/init/etcd.go index 23de11ec76c..ad8d821ac28 100644 --- a/cmd/kubeadm/app/cmd/phases/init/etcd.go +++ b/cmd/kubeadm/app/cmd/phases/init/etcd.go @@ -19,15 +19,15 @@ package phases import ( "fmt" + "github.com/pkg/errors" + + "k8s.io/klog/v2" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" etcdphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/etcd" etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" - - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/kubeconfig.go b/cmd/kubeadm/app/cmd/phases/init/kubeconfig.go index 68c0f4c2a84..c081c69ddcc 100644 --- a/cmd/kubeadm/app/cmd/phases/init/kubeconfig.go +++ b/cmd/kubeadm/app/cmd/phases/init/kubeconfig.go @@ -21,13 +21,13 @@ import ( "os" "path/filepath" + "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/kubelet.go b/cmd/kubeadm/app/cmd/phases/init/kubelet.go index 73dfc0297f9..bf43d23821a 100644 --- a/cmd/kubeadm/app/cmd/phases/init/kubelet.go +++ b/cmd/kubeadm/app/cmd/phases/init/kubelet.go @@ -19,14 +19,14 @@ package phases import ( "fmt" + "github.com/pkg/errors" + + "k8s.io/klog/v2" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" kubeletphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubelet" - - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go b/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go index e8d462a40ff..7f2c6562e3f 100644 --- a/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go +++ b/cmd/kubeadm/app/cmd/phases/init/kubeletfinalize.go @@ -21,16 +21,16 @@ import ( "os" "path/filepath" + "github.com/pkg/errors" + + clientcmd "k8s.io/client-go/tools/clientcmd" + "k8s.io/klog/v2" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeletphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubelet" - - clientcmd "k8s.io/client-go/tools/clientcmd" - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/markcontrolplane.go b/cmd/kubeadm/app/cmd/phases/init/markcontrolplane.go index 384941d538c..b47696c06de 100644 --- a/cmd/kubeadm/app/cmd/phases/init/markcontrolplane.go +++ b/cmd/kubeadm/app/cmd/phases/init/markcontrolplane.go @@ -17,12 +17,12 @@ limitations under the License. package phases import ( + "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" markcontrolplanephase "k8s.io/kubernetes/cmd/kubeadm/app/phases/markcontrolplane" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/preflight.go b/cmd/kubeadm/app/cmd/phases/init/preflight.go index 7a15b729f25..d70058f2a96 100644 --- a/cmd/kubeadm/app/cmd/phases/init/preflight.go +++ b/cmd/kubeadm/app/cmd/phases/init/preflight.go @@ -19,14 +19,14 @@ package phases import ( "fmt" + "github.com/pkg/errors" + + utilsexec "k8s.io/utils/exec" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" "k8s.io/kubernetes/cmd/kubeadm/app/preflight" - - utilsexec "k8s.io/utils/exec" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/uploadcerts.go b/cmd/kubeadm/app/cmd/phases/init/uploadcerts.go index 1ddbb74fa9f..857fb5d00b4 100644 --- a/cmd/kubeadm/app/cmd/phases/init/uploadcerts.go +++ b/cmd/kubeadm/app/cmd/phases/init/uploadcerts.go @@ -19,13 +19,13 @@ package phases import ( "fmt" + "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/phases/copycerts" - - "github.com/pkg/errors" ) // NewUploadCertsPhase returns the uploadCerts phase diff --git a/cmd/kubeadm/app/cmd/phases/init/uploadconfig.go b/cmd/kubeadm/app/cmd/phases/init/uploadconfig.go index cc172d309b1..504d6c83534 100644 --- a/cmd/kubeadm/app/cmd/phases/init/uploadconfig.go +++ b/cmd/kubeadm/app/cmd/phases/init/uploadconfig.go @@ -19,6 +19,12 @@ package phases import ( "fmt" + "github.com/pkg/errors" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" @@ -27,12 +33,6 @@ import ( kubeletphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubelet" patchnodephase "k8s.io/kubernetes/cmd/kubeadm/app/phases/patchnode" "k8s.io/kubernetes/cmd/kubeadm/app/phases/uploadconfig" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/init/waitcontrolplane.go b/cmd/kubeadm/app/cmd/phases/init/waitcontrolplane.go index 55d380683d7..e9f2b9ee1ca 100644 --- a/cmd/kubeadm/app/cmd/phases/init/waitcontrolplane.go +++ b/cmd/kubeadm/app/cmd/phases/init/waitcontrolplane.go @@ -22,16 +22,16 @@ import ( "text/template" "time" - "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun" + "github.com/lithammer/dedent" + "github.com/pkg/errors" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" - "github.com/lithammer/dedent" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/join/checketcd.go b/cmd/kubeadm/app/cmd/phases/join/checketcd.go index 7cd45959c77..f663b3d7e0c 100644 --- a/cmd/kubeadm/app/cmd/phases/join/checketcd.go +++ b/cmd/kubeadm/app/cmd/phases/join/checketcd.go @@ -19,10 +19,10 @@ package phases import ( "fmt" + "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" etcdphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/etcd" - - "github.com/pkg/errors" ) // NewCheckEtcdPhase is a hidden phase that runs after the control-plane-prepare and diff --git a/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go b/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go index e854c11c343..f6382026a2b 100644 --- a/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go +++ b/cmd/kubeadm/app/cmd/phases/join/controlplanejoin.go @@ -19,6 +19,9 @@ package phases import ( "fmt" + "github.com/pkg/errors" + "github.com/spf13/cobra" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" @@ -26,9 +29,6 @@ import ( etcdphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/etcd" markcontrolplanephase "k8s.io/kubernetes/cmd/kubeadm/app/phases/markcontrolplane" etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" - - "github.com/pkg/errors" - "github.com/spf13/cobra" ) var controlPlaneJoinExample = cmdutil.Examples(` diff --git a/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go b/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go index 8aafd7aa7fa..15effe02530 100644 --- a/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go +++ b/cmd/kubeadm/app/cmd/phases/join/controlplaneprepare.go @@ -20,6 +20,12 @@ import ( "fmt" "path/filepath" + "github.com/pkg/errors" + "github.com/spf13/cobra" + + clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" @@ -29,12 +35,6 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/phases/copycerts" kubeconfigphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubeconfig" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - - clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - - "github.com/pkg/errors" - "github.com/spf13/cobra" ) var controlPlanePrepareExample = cmdutil.Examples(` diff --git a/cmd/kubeadm/app/cmd/phases/join/data.go b/cmd/kubeadm/app/cmd/phases/join/data.go index e45b622ac35..ea0b8433139 100644 --- a/cmd/kubeadm/app/cmd/phases/join/data.go +++ b/cmd/kubeadm/app/cmd/phases/join/data.go @@ -19,11 +19,11 @@ package phases import ( "io" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) // JoinData is the interface to use for join phases. diff --git a/cmd/kubeadm/app/cmd/phases/join/data_test.go b/cmd/kubeadm/app/cmd/phases/join/data_test.go index 3d297530d1e..d27f283af38 100644 --- a/cmd/kubeadm/app/cmd/phases/join/data_test.go +++ b/cmd/kubeadm/app/cmd/phases/join/data_test.go @@ -19,11 +19,11 @@ package phases import ( "io" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) // a package local type for testing purposes. diff --git a/cmd/kubeadm/app/cmd/phases/join/kubelet.go b/cmd/kubeadm/app/cmd/phases/join/kubelet.go index 6e9f6e6b422..25a2c2f1005 100644 --- a/cmd/kubeadm/app/cmd/phases/join/kubelet.go +++ b/cmd/kubeadm/app/cmd/phases/join/kubelet.go @@ -22,15 +22,8 @@ import ( "os" "path/filepath" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" - "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeletphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubelet" - patchnodephase "k8s.io/kubernetes/cmd/kubeadm/app/phases/patchnode" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun" - kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" + "github.com/lithammer/dedent" + "github.com/pkg/errors" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -40,8 +33,15 @@ import ( certutil "k8s.io/client-go/util/cert" "k8s.io/klog/v2" - "github.com/lithammer/dedent" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + kubeletphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubelet" + patchnodephase "k8s.io/kubernetes/cmd/kubeadm/app/phases/patchnode" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun" + kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/join/preflight.go b/cmd/kubeadm/app/cmd/phases/join/preflight.go index a8e178fe1ee..b74532a894c 100644 --- a/cmd/kubeadm/app/cmd/phases/join/preflight.go +++ b/cmd/kubeadm/app/cmd/phases/join/preflight.go @@ -21,18 +21,18 @@ import ( "fmt" "text/template" + "github.com/lithammer/dedent" + "github.com/pkg/errors" + + "k8s.io/klog/v2" + utilsexec "k8s.io/utils/exec" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" "k8s.io/kubernetes/cmd/kubeadm/app/preflight" - - "k8s.io/klog/v2" - utilsexec "k8s.io/utils/exec" - - "github.com/lithammer/dedent" - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go b/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go index 4b2ab2ff243..a387ff7cac6 100644 --- a/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go +++ b/cmd/kubeadm/app/cmd/phases/reset/cleanupnode.go @@ -22,6 +22,9 @@ import ( "os" "path/filepath" + "k8s.io/klog/v2" + utilsexec "k8s.io/utils/exec" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" @@ -30,9 +33,6 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/util/initsystem" utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" "k8s.io/kubernetes/cmd/kubeadm/app/util/users" - - "k8s.io/klog/v2" - utilsexec "k8s.io/utils/exec" ) // NewCleanupNodePhase creates a kubeadm workflow phase that cleanup the node diff --git a/cmd/kubeadm/app/cmd/phases/reset/cleanupnode_test.go b/cmd/kubeadm/app/cmd/phases/reset/cleanupnode_test.go index e5e542deeaf..0f5fd1397d9 100644 --- a/cmd/kubeadm/app/cmd/phases/reset/cleanupnode_test.go +++ b/cmd/kubeadm/app/cmd/phases/reset/cleanupnode_test.go @@ -22,11 +22,11 @@ import ( "path/filepath" "testing" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/preflight" - "k8s.io/utils/exec" fakeexec "k8s.io/utils/exec/testing" + + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/preflight" ) func assertExists(t *testing.T, path string) { diff --git a/cmd/kubeadm/app/cmd/phases/reset/data.go b/cmd/kubeadm/app/cmd/phases/reset/data.go index c854c83f0ef..c9913267fcc 100644 --- a/cmd/kubeadm/app/cmd/phases/reset/data.go +++ b/cmd/kubeadm/app/cmd/phases/reset/data.go @@ -19,10 +19,10 @@ package phases import ( "io" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) // resetData is the interface to use for reset phases. diff --git a/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember.go b/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember.go index 3028f92d78e..a1b01d374bd 100644 --- a/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember.go +++ b/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember.go @@ -21,14 +21,14 @@ import ( "fmt" "path/filepath" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" etcdphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/etcd" utilstaticpod "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" - - "k8s.io/klog/v2" ) // NewRemoveETCDMemberPhase creates a kubeadm workflow phase for remove-etcd-member diff --git a/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember_test.go b/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember_test.go index cbc6af002a6..d6d34e92d3b 100644 --- a/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember_test.go +++ b/cmd/kubeadm/app/cmd/phases/reset/removeetcdmember_test.go @@ -22,10 +22,10 @@ import ( "path/filepath" "testing" + "github.com/lithammer/dedent" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - - "github.com/lithammer/dedent" ) const ( diff --git a/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go b/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go index 015567c31e0..1f83a155ed9 100644 --- a/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go +++ b/cmd/kubeadm/app/cmd/phases/upgrade/node/controlplane.go @@ -20,12 +20,12 @@ import ( "fmt" "os" + "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" "k8s.io/kubernetes/cmd/kubeadm/app/phases/upgrade" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - - "github.com/pkg/errors" ) // NewControlPlane creates a kubeadm workflow phase that implements handling of control-plane upgrade. diff --git a/cmd/kubeadm/app/cmd/phases/upgrade/node/data.go b/cmd/kubeadm/app/cmd/phases/upgrade/node/data.go index 8b08855c569..b4f24861eb0 100644 --- a/cmd/kubeadm/app/cmd/phases/upgrade/node/data.go +++ b/cmd/kubeadm/app/cmd/phases/upgrade/node/data.go @@ -17,10 +17,10 @@ limitations under the License. package node import ( - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) // Data is the interface to use for kubeadm upgrade node phases. diff --git a/cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go b/cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go index 142098e88d8..d4602fea94d 100644 --- a/cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go +++ b/cmd/kubeadm/app/cmd/phases/upgrade/node/kubeletconfig.go @@ -21,6 +21,8 @@ import ( "os" "path/filepath" + "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" @@ -28,8 +30,6 @@ import ( kubeletphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/kubelet" "k8s.io/kubernetes/cmd/kubeadm/app/phases/upgrade" dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/cmd/phases/upgrade/node/preflight.go b/cmd/kubeadm/app/cmd/phases/upgrade/node/preflight.go index 19faeff2222..27bc04a695e 100644 --- a/cmd/kubeadm/app/cmd/phases/upgrade/node/preflight.go +++ b/cmd/kubeadm/app/cmd/phases/upgrade/node/preflight.go @@ -19,13 +19,13 @@ package node import ( "fmt" - "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" - "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" - "k8s.io/kubernetes/cmd/kubeadm/app/preflight" + "github.com/pkg/errors" utilsexec "k8s.io/utils/exec" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" + "k8s.io/kubernetes/cmd/kubeadm/app/preflight" ) // NewPreflightPhase creates a kubeadm workflow phase that implements preflight checks for a new node join diff --git a/cmd/kubeadm/app/cmd/phases/util.go b/cmd/kubeadm/app/cmd/phases/util.go index a46cd81b928..8e0f63267b7 100644 --- a/cmd/kubeadm/app/cmd/phases/util.go +++ b/cmd/kubeadm/app/cmd/phases/util.go @@ -17,9 +17,9 @@ limitations under the License. package phases import ( - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/component-base/version" + + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" ) // 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 08578e7a7b5..63aa6c068ca 100644 --- a/cmd/kubeadm/app/cmd/phases/util_test.go +++ b/cmd/kubeadm/app/cmd/phases/util_test.go @@ -19,9 +19,9 @@ package phases import ( "testing" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/component-base/version" + + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" ) func TestSetKubernetesVersion(t *testing.T) { diff --git a/cmd/kubeadm/app/cmd/reset.go b/cmd/kubeadm/app/cmd/reset.go index 95fa42b05c9..865dd6abd8b 100644 --- a/cmd/kubeadm/app/cmd/reset.go +++ b/cmd/kubeadm/app/cmd/reset.go @@ -20,6 +20,14 @@ import ( "fmt" "io" + "github.com/lithammer/dedent" + "github.com/spf13/cobra" + flag "github.com/spf13/pflag" + + "k8s.io/apimachinery/pkg/util/sets" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation" @@ -30,14 +38,6 @@ import ( kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" - - "k8s.io/apimachinery/pkg/util/sets" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - - "github.com/lithammer/dedent" - "github.com/spf13/cobra" - flag "github.com/spf13/pflag" ) var ( diff --git a/cmd/kubeadm/app/cmd/token.go b/cmd/kubeadm/app/cmd/token.go index 2d812091f2f..b7f138124a2 100644 --- a/cmd/kubeadm/app/cmd/token.go +++ b/cmd/kubeadm/app/cmd/token.go @@ -25,6 +25,20 @@ import ( "text/tabwriter" "time" + "github.com/lithammer/dedent" + "github.com/pkg/errors" + "github.com/spf13/cobra" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/fields" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/util/duration" + "k8s.io/cli-runtime/pkg/genericclioptions" + clientset "k8s.io/client-go/kubernetes" + bootstrapapi "k8s.io/cluster-bootstrap/token/api" + bootstraputil "k8s.io/cluster-bootstrap/token/util" + "k8s.io/klog/v2" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" @@ -40,20 +54,6 @@ import ( configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" "k8s.io/kubernetes/cmd/kubeadm/app/util/output" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/fields" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/util/duration" - "k8s.io/cli-runtime/pkg/genericclioptions" - clientset "k8s.io/client-go/kubernetes" - bootstrapapi "k8s.io/cluster-bootstrap/token/api" - bootstraputil "k8s.io/cluster-bootstrap/token/util" - "k8s.io/klog/v2" - - "github.com/lithammer/dedent" - "github.com/pkg/errors" - "github.com/spf13/cobra" ) // newCmdToken returns cobra.Command for token management diff --git a/cmd/kubeadm/app/cmd/token_test.go b/cmd/kubeadm/app/cmd/token_test.go index bd08ae86390..e3de16a5877 100644 --- a/cmd/kubeadm/app/cmd/token_test.go +++ b/cmd/kubeadm/app/cmd/token_test.go @@ -24,13 +24,6 @@ import ( "regexp" "testing" - bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" - kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - outputapischeme "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/scheme" - outputapiv1alpha1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/v1alpha1" - "k8s.io/kubernetes/cmd/kubeadm/app/util/output" - v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -38,6 +31,13 @@ import ( "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" "k8s.io/client-go/tools/clientcmd" + + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" + kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + outputapischeme "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/scheme" + outputapiv1alpha1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/output/v1alpha1" + "k8s.io/kubernetes/cmd/kubeadm/app/util/output" ) const ( diff --git a/cmd/kubeadm/app/cmd/upgrade/apply.go b/cmd/kubeadm/app/cmd/upgrade/apply.go index d920dc14fa3..1705dfd175f 100644 --- a/cmd/kubeadm/app/cmd/upgrade/apply.go +++ b/cmd/kubeadm/app/cmd/upgrade/apply.go @@ -19,6 +19,15 @@ package upgrade import ( "fmt" + "github.com/pkg/errors" + "github.com/spf13/cobra" + + "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/apimachinery/pkg/util/version" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + utilsexec "k8s.io/utils/exec" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" @@ -28,15 +37,6 @@ import ( kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" - - "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/apimachinery/pkg/util/version" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - utilsexec "k8s.io/utils/exec" - - "github.com/pkg/errors" - "github.com/spf13/cobra" ) // applyFlags holds the information about the flags that can be passed to apply diff --git a/cmd/kubeadm/app/cmd/upgrade/common.go b/cmd/kubeadm/app/cmd/upgrade/common.go index e978815ecfb..e5aabe1ba1d 100644 --- a/cmd/kubeadm/app/cmd/upgrade/common.go +++ b/cmd/kubeadm/app/cmd/upgrade/common.go @@ -26,6 +26,15 @@ import ( "strings" "time" + "github.com/pkg/errors" + + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/sets" + fakediscovery "k8s.io/client-go/discovery/fake" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" @@ -39,15 +48,6 @@ import ( configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" dryrunutil "k8s.io/kubernetes/cmd/kubeadm/app/util/dryrun" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/sets" - fakediscovery "k8s.io/client-go/discovery/fake" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) // isKubeadmConfigPresent checks if a kubeadm config type is found in the provided document map diff --git a/cmd/kubeadm/app/cmd/upgrade/diff.go b/cmd/kubeadm/app/cmd/upgrade/diff.go index ff4a468bc58..f2f49f4f071 100644 --- a/cmd/kubeadm/app/cmd/upgrade/diff.go +++ b/cmd/kubeadm/app/cmd/upgrade/diff.go @@ -21,6 +21,15 @@ import ( "io/ioutil" "os" + "github.com/pkg/errors" + "github.com/pmezard/go-difflib/difflib" + "github.com/spf13/cobra" + + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/util/version" + client "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" @@ -29,15 +38,6 @@ import ( kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/util/version" - client "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - - "github.com/pkg/errors" - "github.com/pmezard/go-difflib/difflib" - "github.com/spf13/cobra" ) type diffFlags struct { diff --git a/cmd/kubeadm/app/cmd/upgrade/diff_test.go b/cmd/kubeadm/app/cmd/upgrade/diff_test.go index 7424e735bd2..e6851aea021 100644 --- a/cmd/kubeadm/app/cmd/upgrade/diff_test.go +++ b/cmd/kubeadm/app/cmd/upgrade/diff_test.go @@ -22,10 +22,10 @@ import ( "os" "testing" + "github.com/pkg/errors" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/constants" - - "github.com/pkg/errors" ) func createTestRunDiffFile(contents []byte) (string, error) { diff --git a/cmd/kubeadm/app/cmd/upgrade/node.go b/cmd/kubeadm/app/cmd/upgrade/node.go index bd00d0ebfa7..08b4bf07c46 100644 --- a/cmd/kubeadm/app/cmd/upgrade/node.go +++ b/cmd/kubeadm/app/cmd/upgrade/node.go @@ -19,6 +19,13 @@ package upgrade import ( "os" + "github.com/pkg/errors" + "github.com/spf13/cobra" + flag "github.com/spf13/pflag" + + "k8s.io/apimachinery/pkg/util/sets" + clientset "k8s.io/client-go/kubernetes" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/validation" "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" @@ -26,13 +33,6 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases/workflow" "k8s.io/kubernetes/cmd/kubeadm/app/constants" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" - - "k8s.io/apimachinery/pkg/util/sets" - clientset "k8s.io/client-go/kubernetes" - - "github.com/pkg/errors" - "github.com/spf13/cobra" - flag "github.com/spf13/pflag" ) // nodeOptions defines all the options exposed via flags by kubeadm upgrade node. diff --git a/cmd/kubeadm/app/cmd/upgrade/plan.go b/cmd/kubeadm/app/cmd/upgrade/plan.go index bb64021fec9..9ce8f306032 100644 --- a/cmd/kubeadm/app/cmd/upgrade/plan.go +++ b/cmd/kubeadm/app/cmd/upgrade/plan.go @@ -25,20 +25,20 @@ import ( "strings" "text/tabwriter" + "github.com/lithammer/dedent" + "github.com/pkg/errors" + "github.com/spf13/cobra" + + "k8s.io/apimachinery/pkg/util/version" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" outputapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/output" "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/phases/upgrade" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - - "k8s.io/apimachinery/pkg/util/version" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - - "github.com/lithammer/dedent" - "github.com/pkg/errors" - "github.com/spf13/cobra" ) type planFlags struct { diff --git a/cmd/kubeadm/app/cmd/upgrade/upgrade.go b/cmd/kubeadm/app/cmd/upgrade/upgrade.go index c903afdddc2..f65376b6f0b 100644 --- a/cmd/kubeadm/app/cmd/upgrade/upgrade.go +++ b/cmd/kubeadm/app/cmd/upgrade/upgrade.go @@ -19,12 +19,12 @@ package upgrade import ( "io" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" cmdutil "k8s.io/kubernetes/cmd/kubeadm/app/cmd/util" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - - "github.com/spf13/cobra" - "github.com/spf13/pflag" ) // applyPlanFlags holds the values for the common flags in `kubeadm upgrade apply` and `kubeadm upgrade plan` diff --git a/cmd/kubeadm/app/cmd/util/cmdutil.go b/cmd/kubeadm/app/cmd/util/cmdutil.go index e80322fbc9c..7144b062708 100644 --- a/cmd/kubeadm/app/cmd/util/cmdutil.go +++ b/cmd/kubeadm/app/cmd/util/cmdutil.go @@ -17,16 +17,16 @@ limitations under the License. package util import ( - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/pkg/errors" + "github.com/spf13/cobra" + "github.com/spf13/pflag" "k8s.io/client-go/tools/clientcmd" "k8s.io/klog/v2" - "github.com/pkg/errors" - "github.com/spf13/cobra" - "github.com/spf13/pflag" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd/options" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) // SubCmdRunE returns a function that handles a case where a subcommand must be specified diff --git a/cmd/kubeadm/app/cmd/util/join.go b/cmd/kubeadm/app/cmd/util/join.go index 74cfdaa1923..f500168f68d 100644 --- a/cmd/kubeadm/app/cmd/util/join.go +++ b/cmd/kubeadm/app/cmd/util/join.go @@ -22,13 +22,13 @@ import ( "html/template" "strings" - kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - "k8s.io/kubernetes/cmd/kubeadm/app/util/pubkeypin" + "github.com/pkg/errors" "k8s.io/client-go/tools/clientcmd" clientcertutil "k8s.io/client-go/util/cert" - "github.com/pkg/errors" + kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" + "k8s.io/kubernetes/cmd/kubeadm/app/util/pubkeypin" ) var joinCommandTemplate = template.Must(template.New("join").Parse(`` + diff --git a/cmd/kubeadm/app/cmd/version.go b/cmd/kubeadm/app/cmd/version.go index fdeb3042f2f..c9fb09b8a94 100644 --- a/cmd/kubeadm/app/cmd/version.go +++ b/cmd/kubeadm/app/cmd/version.go @@ -21,13 +21,13 @@ import ( "fmt" "io" + "github.com/pkg/errors" + "github.com/spf13/cobra" + apimachineryversion "k8s.io/apimachinery/pkg/version" "k8s.io/component-base/version" "k8s.io/klog/v2" "sigs.k8s.io/yaml" - - "github.com/pkg/errors" - "github.com/spf13/cobra" ) // Version provides the version information of kubeadm. diff --git a/cmd/kubeadm/app/cmd/version_test.go b/cmd/kubeadm/app/cmd/version_test.go index 6885cd6c1ad..e2e30d7f5e4 100644 --- a/cmd/kubeadm/app/cmd/version_test.go +++ b/cmd/kubeadm/app/cmd/version_test.go @@ -21,9 +21,9 @@ import ( "encoding/json" "testing" - "sigs.k8s.io/yaml" - "github.com/pkg/errors" + + "sigs.k8s.io/yaml" ) func TestNewCmdVersion(t *testing.T) { diff --git a/cmd/kubeadm/app/componentconfigs/checksums.go b/cmd/kubeadm/app/componentconfigs/checksums.go index 7c0b682cb86..d41385616bd 100644 --- a/cmd/kubeadm/app/componentconfigs/checksums.go +++ b/cmd/kubeadm/app/componentconfigs/checksums.go @@ -21,9 +21,9 @@ import ( "fmt" "sort" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - v1 "k8s.io/api/core/v1" + + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) // ChecksumForConfigMap calculates a checksum for the supplied config map. The exact algorithm depends on hash and prefix parameters diff --git a/cmd/kubeadm/app/componentconfigs/checksums_test.go b/cmd/kubeadm/app/componentconfigs/checksums_test.go index 1b7d5aca7c8..dcbcd4024f6 100644 --- a/cmd/kubeadm/app/componentconfigs/checksums_test.go +++ b/cmd/kubeadm/app/componentconfigs/checksums_test.go @@ -19,10 +19,10 @@ package componentconfigs import ( "testing" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) var checksumTestCases = []struct { diff --git a/cmd/kubeadm/app/componentconfigs/configset.go b/cmd/kubeadm/app/componentconfigs/configset.go index adbe7cbde31..906d99fd8cd 100644 --- a/cmd/kubeadm/app/componentconfigs/configset.go +++ b/cmd/kubeadm/app/componentconfigs/configset.go @@ -17,10 +17,7 @@ limitations under the License. package componentconfigs import ( - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/output" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -30,7 +27,10 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/output" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) // handler is a package internal type that handles component config factory and common functionality. diff --git a/cmd/kubeadm/app/componentconfigs/configset_test.go b/cmd/kubeadm/app/componentconfigs/configset_test.go index e669775dd92..7189e9f7263 100644 --- a/cmd/kubeadm/app/componentconfigs/configset_test.go +++ b/cmd/kubeadm/app/componentconfigs/configset_test.go @@ -19,14 +19,14 @@ package componentconfigs import ( "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "github.com/lithammer/dedent" "k8s.io/apimachinery/pkg/runtime" clientsetfake "k8s.io/client-go/kubernetes/fake" - "github.com/lithammer/dedent" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" ) func testClusterCfg() *kubeadmapi.ClusterConfiguration { diff --git a/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go b/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go index 692966a0594..95bd8eb3335 100644 --- a/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go +++ b/cmd/kubeadm/app/componentconfigs/fakeconfig_test.go @@ -24,12 +24,7 @@ import ( "testing" "time" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - outputapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/output" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "github.com/lithammer/dedent" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -37,7 +32,12 @@ import ( clientset "k8s.io/client-go/kubernetes" clientsetfake "k8s.io/client-go/kubernetes/fake" - "github.com/lithammer/dedent" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + outputapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/output" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" ) // All tests in this file use an alternative set of `known` component configs. diff --git a/cmd/kubeadm/app/componentconfigs/kubelet.go b/cmd/kubeadm/app/componentconfigs/kubelet.go index 253713a10d2..35d6078c317 100644 --- a/cmd/kubeadm/app/componentconfigs/kubelet.go +++ b/cmd/kubeadm/app/componentconfigs/kubelet.go @@ -19,17 +19,17 @@ package componentconfigs import ( "path/filepath" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/features" - "k8s.io/kubernetes/cmd/kubeadm/app/util/initsystem" - "k8s.io/apimachinery/pkg/util/version" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" kubeletconfig "k8s.io/kubelet/config/v1beta1" utilpointer "k8s.io/utils/pointer" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/features" + "k8s.io/kubernetes/cmd/kubeadm/app/util/initsystem" ) const ( diff --git a/cmd/kubeadm/app/componentconfigs/kubelet_test.go b/cmd/kubeadm/app/componentconfigs/kubelet_test.go index 4f7faba1cbd..27fa8fc35be 100644 --- a/cmd/kubeadm/app/componentconfigs/kubelet_test.go +++ b/cmd/kubeadm/app/componentconfigs/kubelet_test.go @@ -22,10 +22,7 @@ import ( "reflect" "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/features" + "github.com/lithammer/dedent" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -34,7 +31,10 @@ import ( kubeletconfig "k8s.io/kubelet/config/v1beta1" utilpointer "k8s.io/utils/pointer" - "github.com/lithammer/dedent" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/features" ) func testKubeletConfigMap(contents string) *v1.ConfigMap { diff --git a/cmd/kubeadm/app/componentconfigs/kubeproxy.go b/cmd/kubeadm/app/componentconfigs/kubeproxy.go index 65b1d82e9f7..ac3703a977b 100644 --- a/cmd/kubeadm/app/componentconfigs/kubeproxy.go +++ b/cmd/kubeadm/app/componentconfigs/kubeproxy.go @@ -19,13 +19,13 @@ package componentconfigs import ( "net" + clientset "k8s.io/client-go/kubernetes" + kubeproxyconfig "k8s.io/kube-proxy/config/v1alpha1" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/features" - - clientset "k8s.io/client-go/kubernetes" - kubeproxyconfig "k8s.io/kube-proxy/config/v1alpha1" ) const ( diff --git a/cmd/kubeadm/app/componentconfigs/kubeproxy_test.go b/cmd/kubeadm/app/componentconfigs/kubeproxy_test.go index 0fcb822cb3e..63bd5be2ad1 100644 --- a/cmd/kubeadm/app/componentconfigs/kubeproxy_test.go +++ b/cmd/kubeadm/app/componentconfigs/kubeproxy_test.go @@ -21,10 +21,7 @@ import ( "reflect" "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/features" + "github.com/lithammer/dedent" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -33,7 +30,10 @@ import ( componentbaseconfig "k8s.io/component-base/config/v1alpha1" kubeproxyconfig "k8s.io/kube-proxy/config/v1alpha1" - "github.com/lithammer/dedent" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/features" ) func testKubeProxyConfigMap(contents string) *v1.ConfigMap { diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index d8d7515e3ca..e3249f2b7c1 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -26,6 +26,8 @@ import ( "strings" "time" + "github.com/pkg/errors" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/version" "k8s.io/apimachinery/pkg/util/wait" @@ -33,8 +35,6 @@ import ( bootstrapapi "k8s.io/cluster-bootstrap/token/api" componentversion "k8s.io/component-base/version" utilnet "k8s.io/utils/net" - - "github.com/pkg/errors" ) const ( diff --git a/cmd/kubeadm/app/discovery/discovery.go b/cmd/kubeadm/app/discovery/discovery.go index 8fe41b20d9c..26af504fae0 100644 --- a/cmd/kubeadm/app/discovery/discovery.go +++ b/cmd/kubeadm/app/discovery/discovery.go @@ -19,17 +19,17 @@ package discovery import ( "net/url" + "github.com/pkg/errors" + + clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/discovery/file" "k8s.io/kubernetes/cmd/kubeadm/app/discovery/https" "k8s.io/kubernetes/cmd/kubeadm/app/discovery/token" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - - clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) // TokenUser defines token user diff --git a/cmd/kubeadm/app/discovery/discovery_test.go b/cmd/kubeadm/app/discovery/discovery_test.go index 5d465fc464f..e4aa3ed7c25 100644 --- a/cmd/kubeadm/app/discovery/discovery_test.go +++ b/cmd/kubeadm/app/discovery/discovery_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) func TestFor(t *testing.T) { diff --git a/cmd/kubeadm/app/discovery/file/file.go b/cmd/kubeadm/app/discovery/file/file.go index 7bf6bf1defd..11673f69722 100644 --- a/cmd/kubeadm/app/discovery/file/file.go +++ b/cmd/kubeadm/app/discovery/file/file.go @@ -20,8 +20,7 @@ import ( "context" "time" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" + "github.com/pkg/errors" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -32,7 +31,8 @@ import ( bootstrapapi "k8s.io/cluster-bootstrap/token/api" "k8s.io/klog/v2" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" ) // RetrieveValidatedConfigInfo connects to the API Server and makes sure it can talk diff --git a/cmd/kubeadm/app/discovery/https/https.go b/cmd/kubeadm/app/discovery/https/https.go index e88eee936d8..937f4887b59 100644 --- a/cmd/kubeadm/app/discovery/https/https.go +++ b/cmd/kubeadm/app/discovery/https/https.go @@ -21,11 +21,11 @@ import ( "net/http" "time" - "k8s.io/kubernetes/cmd/kubeadm/app/discovery/file" - netutil "k8s.io/apimachinery/pkg/util/net" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + + "k8s.io/kubernetes/cmd/kubeadm/app/discovery/file" ) // RetrieveValidatedConfigInfo connects to the API Server and makes sure it can talk diff --git a/cmd/kubeadm/app/discovery/token/token.go b/cmd/kubeadm/app/discovery/token/token.go index 110f769ce7b..6a3f3114e2e 100644 --- a/cmd/kubeadm/app/discovery/token/token.go +++ b/cmd/kubeadm/app/discovery/token/token.go @@ -22,12 +22,7 @@ import ( "fmt" "time" - bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - "k8s.io/kubernetes/cmd/kubeadm/app/util/pubkeypin" + "github.com/pkg/errors" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -40,7 +35,12 @@ import ( bootstrap "k8s.io/cluster-bootstrap/token/jws" "k8s.io/klog/v2" - "github.com/pkg/errors" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" + "k8s.io/kubernetes/cmd/kubeadm/app/util/pubkeypin" ) // BootstrapUser defines bootstrap user name diff --git a/cmd/kubeadm/app/discovery/token/token_test.go b/cmd/kubeadm/app/discovery/token/token_test.go index 144350e1817..7d61b3568a3 100644 --- a/cmd/kubeadm/app/discovery/token/token_test.go +++ b/cmd/kubeadm/app/discovery/token/token_test.go @@ -20,8 +20,7 @@ import ( "testing" "time" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + "github.com/pmezard/go-difflib/difflib" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -31,7 +30,8 @@ import ( bootstrapapi "k8s.io/cluster-bootstrap/token/api" tokenjws "k8s.io/cluster-bootstrap/token/jws" - "github.com/pmezard/go-difflib/difflib" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) func TestRetrieveValidatedConfigInfo(t *testing.T) { diff --git a/cmd/kubeadm/app/features/features.go b/cmd/kubeadm/app/features/features.go index a392f40faae..ae3f3f92e44 100644 --- a/cmd/kubeadm/app/features/features.go +++ b/cmd/kubeadm/app/features/features.go @@ -22,10 +22,10 @@ import ( "strconv" "strings" + "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/util/version" "k8s.io/component-base/featuregate" - - "github.com/pkg/errors" ) const ( diff --git a/cmd/kubeadm/app/images/images.go b/cmd/kubeadm/app/images/images.go index 7e97dbc9421..ee55eb6c995 100644 --- a/cmd/kubeadm/app/images/images.go +++ b/cmd/kubeadm/app/images/images.go @@ -19,12 +19,12 @@ package images import ( "fmt" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - - "k8s.io/klog/v2" ) // GetGenericImage generates and returns a platform agnostic image (backed by manifest list) diff --git a/cmd/kubeadm/app/kubeadm.go b/cmd/kubeadm/app/kubeadm.go index c13a3639794..b67c63251b5 100644 --- a/cmd/kubeadm/app/kubeadm.go +++ b/cmd/kubeadm/app/kubeadm.go @@ -20,12 +20,12 @@ import ( "flag" "os" - "k8s.io/kubernetes/cmd/kubeadm/app/cmd" + "github.com/spf13/pflag" cliflag "k8s.io/component-base/cli/flag" "k8s.io/klog/v2" - "github.com/spf13/pflag" + "k8s.io/kubernetes/cmd/kubeadm/app/cmd" ) // Run creates and executes new kubeadm command diff --git a/cmd/kubeadm/app/phases/addons/dns/dns.go b/cmd/kubeadm/app/phases/addons/dns/dns.go index fc6b5fe9b10..c4989818f66 100644 --- a/cmd/kubeadm/app/phases/addons/dns/dns.go +++ b/cmd/kubeadm/app/phases/addons/dns/dns.go @@ -21,12 +21,8 @@ import ( "fmt" "strings" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/features" - "k8s.io/kubernetes/cmd/kubeadm/app/images" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + "github.com/coredns/corefile-migration/migration" + "github.com/pkg/errors" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" @@ -39,8 +35,12 @@ import ( clientsetscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/klog/v2" - "github.com/coredns/corefile-migration/migration" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/features" + "k8s.io/kubernetes/cmd/kubeadm/app/images" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) const ( diff --git a/cmd/kubeadm/app/phases/addons/dns/dns_test.go b/cmd/kubeadm/app/phases/addons/dns/dns_test.go index 4087aab26ab..d645f48ac57 100644 --- a/cmd/kubeadm/app/phases/addons/dns/dns_test.go +++ b/cmd/kubeadm/app/phases/addons/dns/dns_test.go @@ -21,15 +21,15 @@ import ( "strings" "testing" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" clientsetfake "k8s.io/client-go/kubernetes/fake" clientsetscheme "k8s.io/client-go/kubernetes/scheme" + + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" ) func TestCompileManifests(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/addons/proxy/proxy.go b/cmd/kubeadm/app/phases/addons/proxy/proxy.go index 84eccb4c0bc..af213cd3345 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/proxy.go +++ b/cmd/kubeadm/app/phases/addons/proxy/proxy.go @@ -20,12 +20,7 @@ import ( "bytes" "fmt" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/images" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + "github.com/pkg/errors" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" @@ -35,7 +30,12 @@ import ( clientset "k8s.io/client-go/kubernetes" clientsetscheme "k8s.io/client-go/kubernetes/scheme" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/images" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) const ( diff --git a/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go b/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go index 936421fcccf..661bc949d51 100644 --- a/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go +++ b/cmd/kubeadm/app/phases/addons/proxy/proxy_test.go @@ -20,10 +20,6 @@ import ( "strings" "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" - apps "k8s.io/api/apps/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" @@ -31,6 +27,10 @@ import ( clientsetfake "k8s.io/client-go/kubernetes/fake" clientsetscheme "k8s.io/client-go/kubernetes/scheme" core "k8s.io/client-go/testing" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" ) func TestCreateServiceAccount(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo/clusterinfo.go b/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo/clusterinfo.go index 56833fcf13b..20478f6f0b3 100644 --- a/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo/clusterinfo.go +++ b/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo/clusterinfo.go @@ -19,7 +19,7 @@ package clusterinfo import ( "fmt" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + "github.com/pkg/errors" "k8s.io/api/core/v1" rbac "k8s.io/api/rbac/v1" @@ -31,7 +31,7 @@ import ( bootstrapapi "k8s.io/cluster-bootstrap/token/api" "k8s.io/klog/v2" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) const ( diff --git a/cmd/kubeadm/app/phases/bootstraptoken/node/tlsbootstrap.go b/cmd/kubeadm/app/phases/bootstraptoken/node/tlsbootstrap.go index 69efadf75a3..1c48f638bca 100644 --- a/cmd/kubeadm/app/phases/bootstraptoken/node/tlsbootstrap.go +++ b/cmd/kubeadm/app/phases/bootstraptoken/node/tlsbootstrap.go @@ -19,12 +19,12 @@ package node import ( "fmt" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - rbac "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" + + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) const ( diff --git a/cmd/kubeadm/app/phases/bootstraptoken/node/token.go b/cmd/kubeadm/app/phases/bootstraptoken/node/token.go index 81c97799ba5..539d7ef623c 100644 --- a/cmd/kubeadm/app/phases/bootstraptoken/node/token.go +++ b/cmd/kubeadm/app/phases/bootstraptoken/node/token.go @@ -19,14 +19,14 @@ package node import ( "context" - bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + "github.com/pkg/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" bootstraputil "k8s.io/cluster-bootstrap/token/util" - "github.com/pkg/errors" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) // CreateNewTokens tries to create a token and fails if one with the same ID already exists diff --git a/cmd/kubeadm/app/phases/certs/certlist.go b/cmd/kubeadm/app/phases/certs/certlist.go index aa77f7bd578..8cd82bab168 100644 --- a/cmd/kubeadm/app/phases/certs/certlist.go +++ b/cmd/kubeadm/app/phases/certs/certlist.go @@ -22,13 +22,13 @@ import ( "fmt" "io" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "github.com/pkg/errors" certutil "k8s.io/client-go/util/cert" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) const ( diff --git a/cmd/kubeadm/app/phases/certs/certlist_test.go b/cmd/kubeadm/app/phases/certs/certlist_test.go index 878ee3d1098..013affec340 100644 --- a/cmd/kubeadm/app/phases/certs/certlist_test.go +++ b/cmd/kubeadm/app/phases/certs/certlist_test.go @@ -25,10 +25,10 @@ import ( "path" "testing" + certutil "k8s.io/client-go/util/cert" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" - - certutil "k8s.io/client-go/util/cert" ) func TestCertListOrder(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/certs/certs.go b/cmd/kubeadm/app/phases/certs/certs.go index 5996bd71e7c..2ebd58b836e 100644 --- a/cmd/kubeadm/app/phases/certs/certs.go +++ b/cmd/kubeadm/app/phases/certs/certs.go @@ -24,14 +24,14 @@ import ( "path/filepath" "sync" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "github.com/pkg/errors" "k8s.io/client-go/util/keyutil" "k8s.io/klog/v2" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) var ( diff --git a/cmd/kubeadm/app/phases/certs/certs_test.go b/cmd/kubeadm/app/phases/certs/certs_test.go index 7c36497cd47..51e8afa5ce5 100644 --- a/cmd/kubeadm/app/phases/certs/certs_test.go +++ b/cmd/kubeadm/app/phases/certs/certs_test.go @@ -28,18 +28,18 @@ import ( "path/filepath" "testing" + "github.com/pkg/errors" + "github.com/stretchr/testify/assert" + + certutil "k8s.io/client-go/util/cert" + "k8s.io/client-go/util/keyutil" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" pkiutiltesting "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil/testing" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - - certutil "k8s.io/client-go/util/cert" - "k8s.io/client-go/util/keyutil" - - "github.com/pkg/errors" - "github.com/stretchr/testify/assert" ) func createTestCSR(t *testing.T) (*x509.CertificateRequest, crypto.Signer) { diff --git a/cmd/kubeadm/app/phases/certs/renewal/filerenewer_test.go b/cmd/kubeadm/app/phases/certs/renewal/filerenewer_test.go index 85fb38e4b8a..6b3b060bbda 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/filerenewer_test.go +++ b/cmd/kubeadm/app/phases/certs/renewal/filerenewer_test.go @@ -20,9 +20,9 @@ import ( "crypto/x509" "testing" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" - certutil "k8s.io/client-go/util/cert" + + pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) func TestFileRenewer(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/certs/renewal/manager.go b/cmd/kubeadm/app/phases/certs/renewal/manager.go index dc69a6b6f94..09421d7e816 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/manager.go +++ b/cmd/kubeadm/app/phases/certs/renewal/manager.go @@ -20,14 +20,14 @@ import ( "crypto/x509" "sort" + "github.com/pkg/errors" + + certutil "k8s.io/client-go/util/cert" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" - - certutil "k8s.io/client-go/util/cert" - - "github.com/pkg/errors" ) // Manager can be used to coordinate certificate renewal and related processes, diff --git a/cmd/kubeadm/app/phases/certs/renewal/manager_test.go b/cmd/kubeadm/app/phases/certs/renewal/manager_test.go index 93257a3b669..4cb75750069 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/manager_test.go +++ b/cmd/kubeadm/app/phases/certs/renewal/manager_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" + certutil "k8s.io/client-go/util/cert" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" certtestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - - certutil "k8s.io/client-go/util/cert" ) var ( diff --git a/cmd/kubeadm/app/phases/certs/renewal/readwriter.go b/cmd/kubeadm/app/phases/certs/renewal/readwriter.go index cb8b455d572..cba882f1994 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/readwriter.go +++ b/cmd/kubeadm/app/phases/certs/renewal/readwriter.go @@ -22,15 +22,15 @@ import ( "os" "path/filepath" - certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "github.com/pkg/errors" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/keyutil" - "github.com/pkg/errors" + certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" + pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) // certificateReadWriter defines the behavior of a component that diff --git a/cmd/kubeadm/app/phases/certs/renewal/readwriter_test.go b/cmd/kubeadm/app/phases/certs/renewal/readwriter_test.go index 800f391c1f2..46593683667 100644 --- a/cmd/kubeadm/app/phases/certs/renewal/readwriter_test.go +++ b/cmd/kubeadm/app/phases/certs/renewal/readwriter_test.go @@ -24,14 +24,14 @@ import ( "path/filepath" "testing" + "k8s.io/client-go/tools/clientcmd" + certutil "k8s.io/client-go/util/cert" + "k8s.io/client-go/util/keyutil" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - - "k8s.io/client-go/tools/clientcmd" - certutil "k8s.io/client-go/util/cert" - "k8s.io/client-go/util/keyutil" ) func TestPKICertificateReadWriter(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/controlplane/manifests.go b/cmd/kubeadm/app/phases/controlplane/manifests.go index dd9e5732ad3..587f7a46a33 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests.go @@ -24,6 +24,12 @@ import ( "strconv" "strings" + "github.com/pkg/errors" + + v1 "k8s.io/api/core/v1" + "k8s.io/klog/v2" + utilsnet "k8s.io/utils/net" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/features" @@ -32,12 +38,6 @@ import ( kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" staticpodutil "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" "k8s.io/kubernetes/cmd/kubeadm/app/util/users" - - v1 "k8s.io/api/core/v1" - "k8s.io/klog/v2" - utilsnet "k8s.io/utils/net" - - "github.com/pkg/errors" ) // 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 dca3e2adaa0..6abf0679790 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests_test.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests_test.go @@ -26,6 +26,10 @@ import ( "strings" "testing" + "github.com/lithammer/dedent" + + "k8s.io/apimachinery/pkg/util/sets" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/features" @@ -33,10 +37,6 @@ import ( pkiutiltesting "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil/testing" staticpodutil "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - - "k8s.io/apimachinery/pkg/util/sets" - - "github.com/lithammer/dedent" ) const ( diff --git a/cmd/kubeadm/app/phases/controlplane/volumes.go b/cmd/kubeadm/app/phases/controlplane/volumes.go index 1adb55d74e5..29ceb046a00 100644 --- a/cmd/kubeadm/app/phases/controlplane/volumes.go +++ b/cmd/kubeadm/app/phases/controlplane/volumes.go @@ -22,12 +22,12 @@ import ( "path/filepath" "strings" + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/util/sets" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" staticpodutil "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" - - v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/util/sets" ) const ( diff --git a/cmd/kubeadm/app/phases/controlplane/volumes_test.go b/cmd/kubeadm/app/phases/controlplane/volumes_test.go index ca8a647ac70..822938a602a 100644 --- a/cmd/kubeadm/app/phases/controlplane/volumes_test.go +++ b/cmd/kubeadm/app/phases/controlplane/volumes_test.go @@ -23,10 +23,10 @@ import ( "reflect" "testing" + "k8s.io/api/core/v1" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - - "k8s.io/api/core/v1" ) func TestGetEtcdCertVolumes(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/copycerts/copycerts.go b/cmd/kubeadm/app/phases/copycerts/copycerts.go index 7b2621c1e13..c0df7dede96 100644 --- a/cmd/kubeadm/app/phases/copycerts/copycerts.go +++ b/cmd/kubeadm/app/phases/copycerts/copycerts.go @@ -25,12 +25,7 @@ import ( "path" "strings" - bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - nodebootstraptokenphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/node" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - cryptoutil "k8s.io/kubernetes/cmd/kubeadm/app/util/crypto" + "github.com/pkg/errors" v1 "k8s.io/api/core/v1" rbac "k8s.io/api/rbac/v1" @@ -43,7 +38,12 @@ import ( bootstraputil "k8s.io/cluster-bootstrap/token/util" "k8s.io/klog/v2" - "github.com/pkg/errors" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + nodebootstraptokenphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/bootstraptoken/node" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + cryptoutil "k8s.io/kubernetes/cmd/kubeadm/app/util/crypto" ) const ( diff --git a/cmd/kubeadm/app/phases/copycerts/copycerts_test.go b/cmd/kubeadm/app/phases/copycerts/copycerts_test.go index c19cef24e01..16a50e273d1 100644 --- a/cmd/kubeadm/app/phases/copycerts/copycerts_test.go +++ b/cmd/kubeadm/app/phases/copycerts/copycerts_test.go @@ -25,18 +25,18 @@ import ( "regexp" "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" - cryptoutil "k8s.io/kubernetes/cmd/kubeadm/app/util/crypto" - testutil "k8s.io/kubernetes/cmd/kubeadm/test" + "github.com/lithammer/dedent" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" fakeclient "k8s.io/client-go/kubernetes/fake" keyutil "k8s.io/client-go/util/keyutil" - "github.com/lithammer/dedent" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" + cryptoutil "k8s.io/kubernetes/cmd/kubeadm/app/util/crypto" + testutil "k8s.io/kubernetes/cmd/kubeadm/test" ) func TestGetDataFromInitConfig(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/etcd/local.go b/cmd/kubeadm/app/phases/etcd/local.go index ec954ac717c..87a412a3162 100644 --- a/cmd/kubeadm/app/phases/etcd/local.go +++ b/cmd/kubeadm/app/phases/etcd/local.go @@ -25,6 +25,14 @@ import ( "strings" "time" + "github.com/pkg/errors" + + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + utilsnet "k8s.io/utils/net" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/features" @@ -33,14 +41,6 @@ import ( etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" staticpodutil "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" "k8s.io/kubernetes/cmd/kubeadm/app/util/users" - - v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - utilsnet "k8s.io/utils/net" - - "github.com/pkg/errors" ) const ( diff --git a/cmd/kubeadm/app/phases/etcd/local_test.go b/cmd/kubeadm/app/phases/etcd/local_test.go index 708c4e4ec54..8791d223745 100644 --- a/cmd/kubeadm/app/phases/etcd/local_test.go +++ b/cmd/kubeadm/app/phases/etcd/local_test.go @@ -25,13 +25,13 @@ import ( "sort" "testing" + "github.com/lithammer/dedent" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" staticpodutil "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - - "github.com/lithammer/dedent" ) func TestGetEtcdPodSpec(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go index 82cefb5ea9e..23a54501902 100644 --- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go +++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go @@ -26,12 +26,7 @@ import ( "path/filepath" "time" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" + "github.com/pkg/errors" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" @@ -39,7 +34,12 @@ import ( "k8s.io/client-go/util/keyutil" "k8s.io/klog/v2" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + kubeconfigutil "k8s.io/kubernetes/cmd/kubeadm/app/util/kubeconfig" + pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) const ( diff --git a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go index 5191e08f8ea..4eaa8c97cfa 100644 --- a/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go +++ b/cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go @@ -27,6 +27,11 @@ import ( "reflect" "testing" + "github.com/lithammer/dedent" + + "k8s.io/client-go/tools/clientcmd" + clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" @@ -34,11 +39,6 @@ import ( pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" testutil "k8s.io/kubernetes/cmd/kubeadm/test" kubeconfigtestutil "k8s.io/kubernetes/cmd/kubeadm/test/kubeconfig" - - "k8s.io/client-go/tools/clientcmd" - clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - - "github.com/lithammer/dedent" ) func TestGetKubeConfigSpecsFailsIfCADoesntExists(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/kubelet/config.go b/cmd/kubeadm/app/phases/kubelet/config.go index c6ce5f9716f..70b11f2742d 100644 --- a/cmd/kubeadm/app/phases/kubelet/config.go +++ b/cmd/kubeadm/app/phases/kubelet/config.go @@ -22,10 +22,7 @@ import ( "os" "path/filepath" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + "github.com/pkg/errors" v1 "k8s.io/api/core/v1" rbac "k8s.io/api/rbac/v1" @@ -33,7 +30,10 @@ import ( "k8s.io/apimachinery/pkg/util/version" clientset "k8s.io/client-go/kubernetes" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) // 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 7ee89e74f24..84448191f89 100644 --- a/cmd/kubeadm/app/phases/kubelet/config_test.go +++ b/cmd/kubeadm/app/phases/kubelet/config_test.go @@ -19,14 +19,14 @@ package kubelet import ( "testing" - configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/version" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" + + configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" ) func TestCreateConfigMap(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/kubelet/flags.go b/cmd/kubeadm/app/phases/kubelet/flags.go index a2c423a11b5..5615bfdd8cc 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags.go +++ b/cmd/kubeadm/app/phases/kubelet/flags.go @@ -23,14 +23,14 @@ import ( "path/filepath" "strings" + "github.com/pkg/errors" + + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/images" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) type kubeletFlagsOpts struct { diff --git a/cmd/kubeadm/app/phases/kubelet/flags_test.go b/cmd/kubeadm/app/phases/kubelet/flags_test.go index c6b1c32fbea..64b78742510 100644 --- a/cmd/kubeadm/app/phases/kubelet/flags_test.go +++ b/cmd/kubeadm/app/phases/kubelet/flags_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - v1 "k8s.io/api/core/v1" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) func TestBuildKubeletArgMap(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane.go b/cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane.go index 171396e9d6d..c68f80f7fd6 100644 --- a/cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane.go +++ b/cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane.go @@ -19,11 +19,11 @@ package markcontrolplane import ( "fmt" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - "k8s.io/api/core/v1" clientset "k8s.io/client-go/kubernetes" + + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) var labelsToAdd = []string{ diff --git a/cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane_test.go b/cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane_test.go index 023e7e14a67..cb9275124ab 100644 --- a/cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane_test.go +++ b/cmd/kubeadm/app/phases/markcontrolplane/markcontrolplane_test.go @@ -23,12 +23,12 @@ import ( "net/http/httptest" "testing" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) func TestMarkControlPlane(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/patchnode/patchnode.go b/cmd/kubeadm/app/phases/patchnode/patchnode.go index 66866ce42f4..195c753d8b2 100644 --- a/cmd/kubeadm/app/phases/patchnode/patchnode.go +++ b/cmd/kubeadm/app/phases/patchnode/patchnode.go @@ -17,12 +17,12 @@ limitations under the License. package patchnode import ( - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - "k8s.io/api/core/v1" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" + + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) // AnnotateCRISocket annotates the node with the given crisocket diff --git a/cmd/kubeadm/app/phases/patchnode/patchnode_test.go b/cmd/kubeadm/app/phases/patchnode/patchnode_test.go index 339ca842a12..cae45bb3ed5 100644 --- a/cmd/kubeadm/app/phases/patchnode/patchnode_test.go +++ b/cmd/kubeadm/app/phases/patchnode/patchnode_test.go @@ -23,12 +23,12 @@ import ( "net/http/httptest" "testing" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) func TestAnnotateCRISocket(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/upgrade/compute.go b/cmd/kubeadm/app/phases/upgrade/compute.go index a66f32f9b16..ba62352dd96 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute.go +++ b/cmd/kubeadm/app/phases/upgrade/compute.go @@ -20,12 +20,12 @@ import ( "fmt" "strings" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns" - versionutil "k8s.io/apimachinery/pkg/util/version" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" + + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns" ) // 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 e24a01fcd06..b5792c7bb6d 100644 --- a/cmd/kubeadm/app/phases/upgrade/compute_test.go +++ b/cmd/kubeadm/app/phases/upgrade/compute_test.go @@ -24,14 +24,14 @@ import ( "strings" "testing" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/version" versionutil "k8s.io/apimachinery/pkg/util/version" clientsetfake "k8s.io/client-go/kubernetes/fake" + + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) type fakeVersionGetter struct { diff --git a/cmd/kubeadm/app/phases/upgrade/health.go b/cmd/kubeadm/app/phases/upgrade/health.go index 1554c3da356..7ac2fa317cc 100644 --- a/cmd/kubeadm/app/phases/upgrade/health.go +++ b/cmd/kubeadm/app/phases/upgrade/health.go @@ -22,10 +22,7 @@ import ( "os" "time" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/images" - "k8s.io/kubernetes/cmd/kubeadm/app/preflight" + "github.com/pkg/errors" batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" @@ -37,7 +34,10 @@ import ( "k8s.io/klog/v2" utilpointer "k8s.io/utils/pointer" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/images" + "k8s.io/kubernetes/cmd/kubeadm/app/preflight" ) // healthCheck is a helper struct for easily performing healthchecks against the cluster and printing the output diff --git a/cmd/kubeadm/app/phases/upgrade/policy.go b/cmd/kubeadm/app/phases/upgrade/policy.go index 75c48049850..8d5b0441c8e 100644 --- a/cmd/kubeadm/app/phases/upgrade/policy.go +++ b/cmd/kubeadm/app/phases/upgrade/policy.go @@ -20,11 +20,11 @@ import ( "fmt" "strings" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/version" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) const ( diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade.go b/cmd/kubeadm/app/phases/upgrade/postupgrade.go index f14ab47c338..d388194c276 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade.go @@ -20,6 +20,16 @@ import ( "context" "os" + "github.com/pkg/errors" + + v1 "k8s.io/api/core/v1" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/labels" + errorsutil "k8s.io/apimachinery/pkg/util/errors" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns" @@ -31,16 +41,6 @@ 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" - - v1 "k8s.io/api/core/v1" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" - errorsutil "k8s.io/apimachinery/pkg/util/errors" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) // PerformPostUpgradeTasks runs nearly the same functions as 'kubeadm init' would do diff --git a/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go b/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go index 784da7b422b..04ede0a0e3e 100644 --- a/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go +++ b/cmd/kubeadm/app/phases/upgrade/postupgrade_test.go @@ -22,10 +22,10 @@ import ( "strings" "testing" + "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - - "github.com/pkg/errors" ) func TestMoveFiles(t *testing.T) { diff --git a/cmd/kubeadm/app/phases/upgrade/preflight.go b/cmd/kubeadm/app/phases/upgrade/preflight.go index 7c2bebe0741..382e2427ee9 100644 --- a/cmd/kubeadm/app/phases/upgrade/preflight.go +++ b/cmd/kubeadm/app/phases/upgrade/preflight.go @@ -21,16 +21,16 @@ import ( "os" "strings" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns" - "k8s.io/kubernetes/cmd/kubeadm/app/preflight" + "github.com/coredns/corefile-migration/migration" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/sets" clientset "k8s.io/client-go/kubernetes" "k8s.io/klog/v2" - "github.com/coredns/corefile-migration/migration" - "github.com/pkg/errors" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/phases/addons/dns" + "k8s.io/kubernetes/cmd/kubeadm/app/preflight" ) // CoreDNSCheck validates installed kubelet version diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods.go b/cmd/kubeadm/app/phases/upgrade/staticpods.go index e811abc63bb..4375a0115d8 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods.go @@ -23,6 +23,13 @@ import ( "strings" "time" + "github.com/pkg/errors" + + utilerrors "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/apimachinery/pkg/util/version" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/constants" certsphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" @@ -35,13 +42,6 @@ import ( etcdutil "k8s.io/kubernetes/cmd/kubeadm/app/util/etcd" "k8s.io/kubernetes/cmd/kubeadm/app/util/image" "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" - - utilerrors "k8s.io/apimachinery/pkg/util/errors" - "k8s.io/apimachinery/pkg/util/version" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) const ( diff --git a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go index 67fbb9faaa9..21fe5553a55 100644 --- a/cmd/kubeadm/app/phases/upgrade/staticpods_test.go +++ b/cmd/kubeadm/app/phases/upgrade/staticpods_test.go @@ -28,6 +28,12 @@ import ( "testing" "time" + "github.com/pkg/errors" + "go.etcd.io/etcd/client/pkg/v3/transport" + + "k8s.io/client-go/tools/clientcmd" + certutil "k8s.io/client-go/util/cert" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" "k8s.io/kubernetes/cmd/kubeadm/app/constants" @@ -43,12 +49,6 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" pkiutiltesting "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil/testing" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - - "k8s.io/client-go/tools/clientcmd" - certutil "k8s.io/client-go/util/cert" - - "github.com/pkg/errors" - "go.etcd.io/etcd/client/pkg/v3/transport" ) const ( diff --git a/cmd/kubeadm/app/phases/upgrade/versiongetter.go b/cmd/kubeadm/app/phases/upgrade/versiongetter.go index b3440c1a1bc..5e10be36372 100644 --- a/cmd/kubeadm/app/phases/upgrade/versiongetter.go +++ b/cmd/kubeadm/app/phases/upgrade/versiongetter.go @@ -19,7 +19,7 @@ package upgrade import ( "context" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "github.com/pkg/errors" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -27,7 +27,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/component-base/version" - "github.com/pkg/errors" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" ) // VersionGetter defines an interface for fetching different versions. diff --git a/cmd/kubeadm/app/phases/uploadconfig/uploadconfig.go b/cmd/kubeadm/app/phases/uploadconfig/uploadconfig.go index 26d378d2c19..e4ce03019ac 100644 --- a/cmd/kubeadm/app/phases/uploadconfig/uploadconfig.go +++ b/cmd/kubeadm/app/phases/uploadconfig/uploadconfig.go @@ -19,15 +19,15 @@ package uploadconfig import ( "fmt" - 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" - configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" - v1 "k8s.io/api/core/v1" rbac "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" + + 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" + configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" ) const ( diff --git a/cmd/kubeadm/app/phases/uploadconfig/uploadconfig_test.go b/cmd/kubeadm/app/phases/uploadconfig/uploadconfig_test.go index 4661974eb88..a5eb4bc0413 100644 --- a/cmd/kubeadm/app/phases/uploadconfig/uploadconfig_test.go +++ b/cmd/kubeadm/app/phases/uploadconfig/uploadconfig_test.go @@ -21,14 +21,14 @@ import ( "reflect" "testing" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + clientsetfake "k8s.io/client-go/kubernetes/fake" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" configutil "k8s.io/kubernetes/cmd/kubeadm/app/util/config" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" - clientsetfake "k8s.io/client-go/kubernetes/fake" ) func TestUploadConfiguration(t *testing.T) { diff --git a/cmd/kubeadm/app/preflight/checks.go b/cmd/kubeadm/app/preflight/checks.go index e1970b2fb29..ff379ff9c8d 100644 --- a/cmd/kubeadm/app/preflight/checks.go +++ b/cmd/kubeadm/app/preflight/checks.go @@ -34,12 +34,7 @@ import ( "strings" "time" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/images" - "k8s.io/kubernetes/cmd/kubeadm/app/util/initsystem" - utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" + "github.com/pkg/errors" v1 "k8s.io/api/core/v1" netutil "k8s.io/apimachinery/pkg/util/net" @@ -53,7 +48,12 @@ import ( utilsexec "k8s.io/utils/exec" utilsnet "k8s.io/utils/net" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/images" + "k8s.io/kubernetes/cmd/kubeadm/app/util/initsystem" + utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" ) const ( diff --git a/cmd/kubeadm/app/preflight/checks_test.go b/cmd/kubeadm/app/preflight/checks_test.go index 25a919887f6..26ef8b5d004 100644 --- a/cmd/kubeadm/app/preflight/checks_test.go +++ b/cmd/kubeadm/app/preflight/checks_test.go @@ -27,9 +27,8 @@ import ( "strings" "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" + "github.com/lithammer/dedent" + "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/sets" @@ -37,8 +36,9 @@ import ( "k8s.io/utils/exec" fakeexec "k8s.io/utils/exec/testing" - "github.com/lithammer/dedent" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + utilruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" ) var ( diff --git a/cmd/kubeadm/app/preflight/utils.go b/cmd/kubeadm/app/preflight/utils.go index aeba91dac78..1587f64e08d 100644 --- a/cmd/kubeadm/app/preflight/utils.go +++ b/cmd/kubeadm/app/preflight/utils.go @@ -20,10 +20,10 @@ import ( "regexp" "strings" + "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/util/version" utilsexec "k8s.io/utils/exec" - - "github.com/pkg/errors" ) // GetKubeletVersion is helper function that returns version of kubelet available in $PATH diff --git a/cmd/kubeadm/app/preflight/utils_test.go b/cmd/kubeadm/app/preflight/utils_test.go index ecc4527a672..a39eab77dbf 100644 --- a/cmd/kubeadm/app/preflight/utils_test.go +++ b/cmd/kubeadm/app/preflight/utils_test.go @@ -19,10 +19,10 @@ package preflight import ( "testing" + "github.com/pkg/errors" + utilsexec "k8s.io/utils/exec" fakeexec "k8s.io/utils/exec/testing" - - "github.com/pkg/errors" ) func TestGetKubeletVersion(t *testing.T) { diff --git a/cmd/kubeadm/app/util/apiclient/clientbacked_dryrun.go b/cmd/kubeadm/app/util/apiclient/clientbacked_dryrun.go index 7ea7e188210..e8a82f16576 100644 --- a/cmd/kubeadm/app/util/apiclient/clientbacked_dryrun.go +++ b/cmd/kubeadm/app/util/apiclient/clientbacked_dryrun.go @@ -21,6 +21,8 @@ import ( "encoding/json" "fmt" + "github.com/pkg/errors" + apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -30,8 +32,6 @@ import ( "k8s.io/client-go/rest" core "k8s.io/client-go/testing" "k8s.io/client-go/tools/clientcmd" - - "github.com/pkg/errors" ) // ClientBackedDryRunGetter implements the DryRunGetter interface for use in NewDryRunClient() and proxies all GET and LIST requests to the backing API server reachable via rest.Config diff --git a/cmd/kubeadm/app/util/apiclient/dryrunclient.go b/cmd/kubeadm/app/util/apiclient/dryrunclient.go index 072f76ee5a6..fabda0a9c34 100644 --- a/cmd/kubeadm/app/util/apiclient/dryrunclient.go +++ b/cmd/kubeadm/app/util/apiclient/dryrunclient.go @@ -23,7 +23,7 @@ import ( "io" "strings" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -31,7 +31,7 @@ import ( fakeclientset "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" - "github.com/pkg/errors" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" ) // DryRunGetter is an interface that must be supplied to the NewDryRunClient function in order to construct a fully functional fake dryrun clientset diff --git a/cmd/kubeadm/app/util/apiclient/idempotency.go b/cmd/kubeadm/app/util/apiclient/idempotency.go index 569ae360b6a..5f0b928e419 100644 --- a/cmd/kubeadm/app/util/apiclient/idempotency.go +++ b/cmd/kubeadm/app/util/apiclient/idempotency.go @@ -21,7 +21,7 @@ import ( "encoding/json" "fmt" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/pkg/errors" apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" @@ -34,7 +34,7 @@ import ( clientset "k8s.io/client-go/kubernetes" clientsetretry "k8s.io/client-go/util/retry" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) // ConfigMapMutator is a function that mutates the given ConfigMap and optionally returns an error diff --git a/cmd/kubeadm/app/util/apiclient/idempotency_test.go b/cmd/kubeadm/app/util/apiclient/idempotency_test.go index b77674d052c..a635622d4b7 100644 --- a/cmd/kubeadm/app/util/apiclient/idempotency_test.go +++ b/cmd/kubeadm/app/util/apiclient/idempotency_test.go @@ -20,14 +20,14 @@ import ( "context" "testing" + "github.com/pkg/errors" + v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" - - "github.com/pkg/errors" ) const configMapName = "configmap" diff --git a/cmd/kubeadm/app/util/apiclient/init_dryrun.go b/cmd/kubeadm/app/util/apiclient/init_dryrun.go index e63c62fd0ab..6b46dd73b08 100644 --- a/cmd/kubeadm/app/util/apiclient/init_dryrun.go +++ b/cmd/kubeadm/app/util/apiclient/init_dryrun.go @@ -20,7 +20,7 @@ import ( "net" "strings" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/pkg/errors" "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -30,7 +30,7 @@ import ( core "k8s.io/client-go/testing" utilnet "k8s.io/utils/net" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) // InitDryRunGetter implements the DryRunGetter interface and can be used to GET/LIST values in the dryrun fake clientset diff --git a/cmd/kubeadm/app/util/apiclient/wait.go b/cmd/kubeadm/app/util/apiclient/wait.go index 6e3d3cc4650..6d62e736e66 100644 --- a/cmd/kubeadm/app/util/apiclient/wait.go +++ b/cmd/kubeadm/app/util/apiclient/wait.go @@ -23,7 +23,7 @@ import ( "net/http" "time" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/pkg/errors" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - "github.com/pkg/errors" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) // Waiter is an interface for waiting for criteria in Kubernetes to happen diff --git a/cmd/kubeadm/app/util/certs/util.go b/cmd/kubeadm/app/util/certs/util.go index 44a4407cc00..f61d836ff48 100644 --- a/cmd/kubeadm/app/util/certs/util.go +++ b/cmd/kubeadm/app/util/certs/util.go @@ -24,10 +24,10 @@ import ( "path" "testing" - pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" - certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/keyutil" + + pkiutil "k8s.io/kubernetes/cmd/kubeadm/app/util/pkiutil" ) // SetupCertificateAuthority is a utility function for kubeadm testing that creates a diff --git a/cmd/kubeadm/app/util/config/cluster.go b/cmd/kubeadm/app/util/config/cluster.go index 12fce577e84..730728b374c 100644 --- a/cmd/kubeadm/app/util/config/cluster.go +++ b/cmd/kubeadm/app/util/config/cluster.go @@ -24,12 +24,7 @@ import ( "path/filepath" "strings" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" + "github.com/pkg/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -39,7 +34,12 @@ import ( "k8s.io/client-go/tools/clientcmd" certutil "k8s.io/client-go/util/cert" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) // FetchInitConfigurationFromCluster fetches configuration from 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 8aa9490a351..505f947690a 100644 --- a/cmd/kubeadm/app/util/config/cluster_test.go +++ b/cmd/kubeadm/app/util/config/cluster_test.go @@ -27,12 +27,7 @@ import ( "strings" "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmapiv1old "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - testresources "k8s.io/kubernetes/cmd/kubeadm/test/resources" + "github.com/pkg/errors" v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -43,7 +38,12 @@ import ( clientsetfake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmapiv1old "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + testresources "k8s.io/kubernetes/cmd/kubeadm/test/resources" ) var k8sVersionString = kubeadmconstants.MinimumControlPlaneVersion.String() diff --git a/cmd/kubeadm/app/util/config/common.go b/cmd/kubeadm/app/util/config/common.go index 04440549468..9f3b17812a3 100644 --- a/cmd/kubeadm/app/util/config/common.go +++ b/cmd/kubeadm/app/util/config/common.go @@ -22,11 +22,7 @@ import ( "reflect" "strings" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -36,7 +32,11 @@ import ( componentversion "k8s.io/component-base/version" "k8s.io/klog/v2" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" ) // MarshalKubeadmConfigObject marshals an Object registered in the kubeadm scheme. If the object is a InitConfiguration or ClusterConfiguration, some extra logic is run diff --git a/cmd/kubeadm/app/util/config/common_test.go b/cmd/kubeadm/app/util/config/common_test.go index 58eb93d87b7..f74ae8c20e5 100644 --- a/cmd/kubeadm/app/util/config/common_test.go +++ b/cmd/kubeadm/app/util/config/common_test.go @@ -20,16 +20,16 @@ import ( "fmt" "testing" - kubeadmapiv1old "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "github.com/lithammer/dedent" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/version" apimachineryversion "k8s.io/apimachinery/pkg/version" - "github.com/lithammer/dedent" + kubeadmapiv1old "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" ) const KubeadmGroupName = "kubeadm.k8s.io" diff --git a/cmd/kubeadm/app/util/config/initconfiguration.go b/cmd/kubeadm/app/util/config/initconfiguration.go index 50071285bc4..9010a369ba6 100644 --- a/cmd/kubeadm/app/util/config/initconfiguration.go +++ b/cmd/kubeadm/app/util/config/initconfiguration.go @@ -23,6 +23,15 @@ import ( "net" "strconv" + "github.com/pkg/errors" + + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" + netutil "k8s.io/apimachinery/pkg/util/net" + bootstraputil "k8s.io/cluster-bootstrap/token/util" + "k8s.io/klog/v2" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" @@ -33,15 +42,6 @@ import ( kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" "k8s.io/kubernetes/cmd/kubeadm/app/util/config/strict" kubeadmruntime "k8s.io/kubernetes/cmd/kubeadm/app/util/runtime" - - v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - netutil "k8s.io/apimachinery/pkg/util/net" - bootstraputil "k8s.io/cluster-bootstrap/token/util" - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) var ( diff --git a/cmd/kubeadm/app/util/config/initconfiguration_test.go b/cmd/kubeadm/app/util/config/initconfiguration_test.go index fa2189c2f0a..6672f294392 100644 --- a/cmd/kubeadm/app/util/config/initconfiguration_test.go +++ b/cmd/kubeadm/app/util/config/initconfiguration_test.go @@ -23,12 +23,12 @@ import ( "path/filepath" "testing" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" + + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) func TestLoadInitConfigurationFromFile(t *testing.T) { diff --git a/cmd/kubeadm/app/util/config/joinconfiguration.go b/cmd/kubeadm/app/util/config/joinconfiguration.go index 985e03aed3f..b8f1f6ff3f7 100644 --- a/cmd/kubeadm/app/util/config/joinconfiguration.go +++ b/cmd/kubeadm/app/util/config/joinconfiguration.go @@ -19,6 +19,11 @@ package config import ( "io/ioutil" + "github.com/pkg/errors" + + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/klog/v2" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmscheme "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" @@ -26,11 +31,6 @@ import ( "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" "k8s.io/kubernetes/cmd/kubeadm/app/util/config/strict" - - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/klog/v2" - - "github.com/pkg/errors" ) // SetJoinDynamicDefaults checks and sets configuration values for the JoinConfiguration object diff --git a/cmd/kubeadm/app/util/config/joinconfiguration_test.go b/cmd/kubeadm/app/util/config/joinconfiguration_test.go index 1692accfb17..b355c0f3fab 100644 --- a/cmd/kubeadm/app/util/config/joinconfiguration_test.go +++ b/cmd/kubeadm/app/util/config/joinconfiguration_test.go @@ -23,9 +23,9 @@ import ( "path/filepath" "testing" - kubeadmapiv1old "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" - "github.com/lithammer/dedent" + + kubeadmapiv1old "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" ) func TestLoadJoinConfigurationFromFile(t *testing.T) { diff --git a/cmd/kubeadm/app/util/config/strict/strict.go b/cmd/kubeadm/app/util/config/strict/strict.go index 7e89e3a88cc..c8630c5e230 100644 --- a/cmd/kubeadm/app/util/config/strict/strict.go +++ b/cmd/kubeadm/app/util/config/strict/strict.go @@ -17,14 +17,14 @@ limitations under the License. package strict import ( - "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/klog/v2" - "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" "sigs.k8s.io/yaml" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/scheme" + "k8s.io/kubernetes/cmd/kubeadm/app/componentconfigs" ) // VerifyUnmarshalStrict takes a YAML byte slice and a GroupVersionKind and verifies if the YAML diff --git a/cmd/kubeadm/app/util/config/strict/strict_test.go b/cmd/kubeadm/app/util/config/strict/strict_test.go index 3c592460217..233e7414c67 100644 --- a/cmd/kubeadm/app/util/config/strict/strict_test.go +++ b/cmd/kubeadm/app/util/config/strict/strict_test.go @@ -21,12 +21,12 @@ import ( "path/filepath" "testing" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/apimachinery/pkg/runtime/schema" kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" + + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) func TestVerifyUnmarshalStrict(t *testing.T) { diff --git a/cmd/kubeadm/app/util/crypto/crypto_test.go b/cmd/kubeadm/app/util/crypto/crypto_test.go index ffbfac86143..40fd2959545 100644 --- a/cmd/kubeadm/app/util/crypto/crypto_test.go +++ b/cmd/kubeadm/app/util/crypto/crypto_test.go @@ -19,9 +19,9 @@ package crypto import ( "testing" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "github.com/lithammer/dedent" + + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) func TestEncryptAndDecryptData(t *testing.T) { diff --git a/cmd/kubeadm/app/util/dryrun/dryrun.go b/cmd/kubeadm/app/util/dryrun/dryrun.go index 43ff69a5010..6b68e4ac27c 100644 --- a/cmd/kubeadm/app/util/dryrun/dryrun.go +++ b/cmd/kubeadm/app/util/dryrun/dryrun.go @@ -23,12 +23,12 @@ import ( "path/filepath" "time" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + errorsutil "k8s.io/apimachinery/pkg/util/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - errorsutil "k8s.io/apimachinery/pkg/util/errors" ) // FileToPrint represents a temporary file on disk that might want to be aliased when printing diff --git a/cmd/kubeadm/app/util/endpoint.go b/cmd/kubeadm/app/util/endpoint.go index 4a55f7ea805..327038692ab 100644 --- a/cmd/kubeadm/app/util/endpoint.go +++ b/cmd/kubeadm/app/util/endpoint.go @@ -22,12 +22,12 @@ import ( "net/url" "strconv" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/validation" utilsnet "k8s.io/utils/net" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) // GetControlPlaneEndpoint returns a properly formatted endpoint for the control plane built according following rules: diff --git a/cmd/kubeadm/app/util/etcd/etcd.go b/cmd/kubeadm/app/util/etcd/etcd.go index 56d201ffad7..ed1e4ba5f3c 100644 --- a/cmd/kubeadm/app/util/etcd/etcd.go +++ b/cmd/kubeadm/app/util/etcd/etcd.go @@ -27,20 +27,20 @@ import ( "strings" "time" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/wait" - clientset "k8s.io/client-go/kubernetes" - "k8s.io/klog/v2" - "github.com/pkg/errors" "go.etcd.io/etcd/api/v3/etcdserverpb" "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" "go.etcd.io/etcd/client/pkg/v3/transport" clientv3 "go.etcd.io/etcd/client/v3" "google.golang.org/grpc" + + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/wait" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/klog/v2" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) const etcdTimeout = 2 * time.Second diff --git a/cmd/kubeadm/app/util/etcd/etcd_test.go b/cmd/kubeadm/app/util/etcd/etcd_test.go index e50779632ac..d0aa67593b4 100644 --- a/cmd/kubeadm/app/util/etcd/etcd_test.go +++ b/cmd/kubeadm/app/util/etcd/etcd_test.go @@ -22,9 +22,7 @@ import ( "strconv" "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - testresources "k8s.io/kubernetes/cmd/kubeadm/test/resources" + "github.com/pkg/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" @@ -32,7 +30,9 @@ import ( clientsetfake "k8s.io/client-go/kubernetes/fake" clienttesting "k8s.io/client-go/testing" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" + testresources "k8s.io/kubernetes/cmd/kubeadm/test/resources" ) func testGetURL(t *testing.T, getURLFunc func(*kubeadmapi.APIEndpoint) string, port int) { diff --git a/cmd/kubeadm/app/util/kubeconfig/kubeconfig.go b/cmd/kubeadm/app/util/kubeconfig/kubeconfig.go index cc03c085d57..cdda104ee0f 100644 --- a/cmd/kubeadm/app/util/kubeconfig/kubeconfig.go +++ b/cmd/kubeadm/app/util/kubeconfig/kubeconfig.go @@ -20,11 +20,11 @@ import ( "fmt" "io/ioutil" + "github.com/pkg/errors" + clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - - "github.com/pkg/errors" ) // CreateBasic creates a basic, general KubeConfig object that then can be extended diff --git a/cmd/kubeadm/app/util/marshal.go b/cmd/kubeadm/app/util/marshal.go index 30c495be1bd..38b300e73ca 100644 --- a/cmd/kubeadm/app/util/marshal.go +++ b/cmd/kubeadm/app/util/marshal.go @@ -21,8 +21,7 @@ import ( "bytes" "io" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -32,7 +31,8 @@ import ( utilyaml "k8s.io/apimachinery/pkg/util/yaml" clientsetscheme "k8s.io/client-go/kubernetes/scheme" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) // MarshalToYaml marshals an object into yaml. diff --git a/cmd/kubeadm/app/util/marshal_test.go b/cmd/kubeadm/app/util/marshal_test.go index 6950b1c2e87..4e7b02fc20d 100644 --- a/cmd/kubeadm/app/util/marshal_test.go +++ b/cmd/kubeadm/app/util/marshal_test.go @@ -22,16 +22,16 @@ import ( "sort" "testing" - bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/serializer" + + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmapiv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) var files = map[string][]byte{ diff --git a/cmd/kubeadm/app/util/output/output.go b/cmd/kubeadm/app/util/output/output.go index 4420e1dba35..a9776657784 100644 --- a/cmd/kubeadm/app/util/output/output.go +++ b/cmd/kubeadm/app/util/output/output.go @@ -21,11 +21,11 @@ import ( "io" "strings" + "github.com/spf13/cobra" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" - - "github.com/spf13/cobra" ) // TextOutput describes the plain text output diff --git a/cmd/kubeadm/app/util/patches/patches.go b/cmd/kubeadm/app/util/patches/patches.go index c9253c314b2..1beec43b1f8 100644 --- a/cmd/kubeadm/app/util/patches/patches.go +++ b/cmd/kubeadm/app/util/patches/patches.go @@ -28,13 +28,13 @@ import ( "strings" "sync" + jsonpatch "github.com/evanphx/json-patch" + "github.com/pkg/errors" + "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/strategicpatch" utilyaml "k8s.io/apimachinery/pkg/util/yaml" "sigs.k8s.io/yaml" - - jsonpatch "github.com/evanphx/json-patch" - "github.com/pkg/errors" ) // PatchTarget defines a target to be patched, such as a control-plane static Pod. diff --git a/cmd/kubeadm/app/util/patches/patches_test.go b/cmd/kubeadm/app/util/patches/patches_test.go index f56de6605de..a04743b02d8 100644 --- a/cmd/kubeadm/app/util/patches/patches_test.go +++ b/cmd/kubeadm/app/util/patches/patches_test.go @@ -24,10 +24,10 @@ import ( "reflect" "testing" + "github.com/pkg/errors" + "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" - - "github.com/pkg/errors" ) var testKnownTargets = []string{ diff --git a/cmd/kubeadm/app/util/pkiutil/pki_helpers.go b/cmd/kubeadm/app/util/pkiutil/pki_helpers.go index 9bc8d6cd085..645cde98a63 100644 --- a/cmd/kubeadm/app/util/pkiutil/pki_helpers.go +++ b/cmd/kubeadm/app/util/pkiutil/pki_helpers.go @@ -35,17 +35,17 @@ import ( "path/filepath" "time" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - "k8s.io/kubernetes/cmd/kubeadm/app/features" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "github.com/pkg/errors" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/validation" certutil "k8s.io/client-go/util/cert" "k8s.io/client-go/util/keyutil" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "k8s.io/kubernetes/cmd/kubeadm/app/features" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" ) const ( diff --git a/cmd/kubeadm/app/util/pkiutil/pki_helpers_test.go b/cmd/kubeadm/app/util/pkiutil/pki_helpers_test.go index 338f080ca4c..cfa79295608 100644 --- a/cmd/kubeadm/app/util/pkiutil/pki_helpers_test.go +++ b/cmd/kubeadm/app/util/pkiutil/pki_helpers_test.go @@ -29,9 +29,9 @@ import ( "reflect" "testing" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - certutil "k8s.io/client-go/util/cert" + + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" ) var ( diff --git a/cmd/kubeadm/app/util/runtime/runtime.go b/cmd/kubeadm/app/util/runtime/runtime.go index 86479b7babe..e422cef9e59 100644 --- a/cmd/kubeadm/app/util/runtime/runtime.go +++ b/cmd/kubeadm/app/util/runtime/runtime.go @@ -21,12 +21,12 @@ import ( goruntime "runtime" "strings" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/pkg/errors" errorsutil "k8s.io/apimachinery/pkg/util/errors" utilsexec "k8s.io/utils/exec" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) // ContainerRuntime is an interface for working with container runtimes diff --git a/cmd/kubeadm/app/util/runtime/runtime_test.go b/cmd/kubeadm/app/util/runtime/runtime_test.go index 22bac2ffe5f..ca0c5a502b1 100644 --- a/cmd/kubeadm/app/util/runtime/runtime_test.go +++ b/cmd/kubeadm/app/util/runtime/runtime_test.go @@ -24,12 +24,12 @@ import ( "runtime" "testing" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/pkg/errors" "k8s.io/utils/exec" fakeexec "k8s.io/utils/exec/testing" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) func TestNewContainerRuntime(t *testing.T) { diff --git a/cmd/kubeadm/app/util/staticpod/utils.go b/cmd/kubeadm/app/util/staticpod/utils.go index 10e2cf408c1..8c561c39f6d 100644 --- a/cmd/kubeadm/app/util/staticpod/utils.go +++ b/cmd/kubeadm/app/util/staticpod/utils.go @@ -28,18 +28,18 @@ import ( "strings" "sync" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" - "k8s.io/kubernetes/cmd/kubeadm/app/util/patches" - "k8s.io/kubernetes/cmd/kubeadm/app/util/users" + "github.com/pkg/errors" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" + "k8s.io/kubernetes/cmd/kubeadm/app/util/patches" + "k8s.io/kubernetes/cmd/kubeadm/app/util/users" ) const ( diff --git a/cmd/kubeadm/app/util/staticpod/utils_linux.go b/cmd/kubeadm/app/util/staticpod/utils_linux.go index 5dc05a6b07c..44a83166fc3 100644 --- a/cmd/kubeadm/app/util/staticpod/utils_linux.go +++ b/cmd/kubeadm/app/util/staticpod/utils_linux.go @@ -22,15 +22,15 @@ import ( "fmt" "path/filepath" - kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - certphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" - "k8s.io/kubernetes/cmd/kubeadm/app/util/users" + "github.com/pkg/errors" v1 "k8s.io/api/core/v1" "k8s.io/utils/pointer" - "github.com/pkg/errors" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" + certphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/certs" + "k8s.io/kubernetes/cmd/kubeadm/app/util/users" ) type pathOwnerAndPermissionsUpdaterFunc func(path string, uid, gid int64, perms uint32) error diff --git a/cmd/kubeadm/app/util/staticpod/utils_linux_test.go b/cmd/kubeadm/app/util/staticpod/utils_linux_test.go index e8322748ff3..6a55c926340 100644 --- a/cmd/kubeadm/app/util/staticpod/utils_linux_test.go +++ b/cmd/kubeadm/app/util/staticpod/utils_linux_test.go @@ -23,11 +23,11 @@ import ( "reflect" "testing" - "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" - kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" - v1 "k8s.io/api/core/v1" "k8s.io/utils/pointer" + + "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" + kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) type ownerAndPermissions struct { diff --git a/cmd/kubeadm/app/util/staticpod/utils_others.go b/cmd/kubeadm/app/util/staticpod/utils_others.go index 77f01040d30..1b14e326760 100644 --- a/cmd/kubeadm/app/util/staticpod/utils_others.go +++ b/cmd/kubeadm/app/util/staticpod/utils_others.go @@ -19,10 +19,10 @@ limitations under the License. package staticpod import ( + v1 "k8s.io/api/core/v1" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" "k8s.io/kubernetes/cmd/kubeadm/app/util/users" - - v1 "k8s.io/api/core/v1" ) // RunComponentAsNonRoot is a NO-OP on non linux. diff --git a/cmd/kubeadm/app/util/staticpod/utils_test.go b/cmd/kubeadm/app/util/staticpod/utils_test.go index 60f3afb9716..10bd53e6c14 100644 --- a/cmd/kubeadm/app/util/staticpod/utils_test.go +++ b/cmd/kubeadm/app/util/staticpod/utils_test.go @@ -25,12 +25,12 @@ import ( "strconv" "testing" + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" testutil "k8s.io/kubernetes/cmd/kubeadm/test" - - v1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func TestComponentResources(t *testing.T) { diff --git a/cmd/kubeadm/app/util/users/users_linux.go b/cmd/kubeadm/app/util/users/users_linux.go index 01e63412818..12b0f53088c 100644 --- a/cmd/kubeadm/app/util/users/users_linux.go +++ b/cmd/kubeadm/app/util/users/users_linux.go @@ -30,11 +30,11 @@ import ( "syscall" "time" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/pkg/errors" "k8s.io/klog/v2" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) // EntryMap holds a map of user or group entries. diff --git a/cmd/kubeadm/app/util/version.go b/cmd/kubeadm/app/util/version.go index d5521e01a14..8d7d795b3bb 100644 --- a/cmd/kubeadm/app/util/version.go +++ b/cmd/kubeadm/app/util/version.go @@ -24,14 +24,14 @@ import ( "strings" "time" - "k8s.io/kubernetes/cmd/kubeadm/app/constants" + "github.com/pkg/errors" netutil "k8s.io/apimachinery/pkg/util/net" versionutil "k8s.io/apimachinery/pkg/util/version" pkgversion "k8s.io/component-base/version" "k8s.io/klog/v2" - "github.com/pkg/errors" + "k8s.io/kubernetes/cmd/kubeadm/app/constants" ) const ( diff --git a/cmd/kubeadm/test/cmd/init_test.go b/cmd/kubeadm/test/cmd/init_test.go index 1e2d82ae9c9..19e85b4324a 100644 --- a/cmd/kubeadm/test/cmd/init_test.go +++ b/cmd/kubeadm/test/cmd/init_test.go @@ -22,9 +22,9 @@ import ( "strings" "testing" - "k8s.io/apimachinery/pkg/util/version" - "github.com/lithammer/dedent" + + "k8s.io/apimachinery/pkg/util/version" ) func runKubeadmInit(args ...string) (string, string, int, error) { diff --git a/cmd/kubeadm/test/kubeconfig/util.go b/cmd/kubeadm/test/kubeconfig/util.go index 874b0df4726..147a3b0a299 100644 --- a/cmd/kubeadm/test/kubeconfig/util.go +++ b/cmd/kubeadm/test/kubeconfig/util.go @@ -21,9 +21,9 @@ import ( "encoding/pem" "testing" - certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" - clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + + certstestutil "k8s.io/kubernetes/cmd/kubeadm/app/util/certs" ) // AssertKubeConfigCurrentCluster is a utility function for kubeadm testing that asserts if the CurrentCluster in diff --git a/cmd/kubeadm/test/resources/configmap.go b/cmd/kubeadm/test/resources/configmap.go index f07a28fbda0..00799cb32f0 100644 --- a/cmd/kubeadm/test/resources/configmap.go +++ b/cmd/kubeadm/test/resources/configmap.go @@ -17,11 +17,11 @@ limitations under the License. package resources import ( - "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" + + "k8s.io/kubernetes/cmd/kubeadm/app/util/apiclient" ) // FakeConfigMap represents a fake config map diff --git a/cmd/kubeadm/test/resources/pods.go b/cmd/kubeadm/test/resources/pods.go index 0ff26a41ffb..5173fa2259e 100644 --- a/cmd/kubeadm/test/resources/pods.go +++ b/cmd/kubeadm/test/resources/pods.go @@ -20,11 +20,11 @@ import ( "context" "fmt" - staticpodutil "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" + + staticpodutil "k8s.io/kubernetes/cmd/kubeadm/app/util/staticpod" ) // FakeStaticPod represents a fake static pod