diff --git a/cmd/cloud-controller-manager/.import-restrictions b/cmd/cloud-controller-manager/.import-restrictions index 5067ab530a2..01432f93273 100644 --- a/cmd/cloud-controller-manager/.import-restrictions +++ b/cmd/cloud-controller-manager/.import-restrictions @@ -79,7 +79,7 @@ rules: - k8s.io/kubernetes/pkg/features - k8s.io/kubernetes/pkg/fieldpath - k8s.io/kubernetes/pkg/kubelet/types - - k8s.io/kubernetes/pkg/master/ports + - k8s.io/kubernetes/pkg/cluster/ports - k8s.io/kubernetes/pkg/security/apparmor - k8s.io/kubernetes/pkg/securitycontext - k8s.io/kubernetes/pkg/serviceaccount diff --git a/cmd/kube-apiserver/app/options/BUILD b/cmd/kube-apiserver/app/options/BUILD index 3e8edb7302e..d7015268541 100644 --- a/cmd/kube-apiserver/app/options/BUILD +++ b/cmd/kube-apiserver/app/options/BUILD @@ -19,10 +19,10 @@ go_library( "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/cloudprovider/providers:go_default_library", + "//pkg/cluster/ports:go_default_library", "//pkg/features:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//pkg/kubelet/client:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/master/reconcilers:go_default_library", "//pkg/serviceaccount:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver:go_default_library", diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 1434cc181b4..0f00095b938 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -32,7 +32,7 @@ import ( _ "k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/master/reconcilers" "k8s.io/kubernetes/pkg/serviceaccount" ) diff --git a/cmd/kube-controller-manager/app/options/BUILD b/cmd/kube-controller-manager/app/options/BUILD index 55ece3b9e45..ba65d77052b 100644 --- a/cmd/kube-controller-manager/app/options/BUILD +++ b/cmd/kube-controller-manager/app/options/BUILD @@ -37,6 +37,7 @@ go_library( deps = [ "//cmd/controller-manager/app/options:go_default_library", "//cmd/kube-controller-manager/app/config:go_default_library", + "//pkg/cluster/ports:go_default_library", "//pkg/controller/apis/config:go_default_library", "//pkg/controller/apis/config/scheme:go_default_library", "//pkg/controller/certificates/signer/config:go_default_library", @@ -62,7 +63,6 @@ go_library( "//pkg/controller/volume/attachdetach/config:go_default_library", "//pkg/controller/volume/persistentvolume/config:go_default_library", "//pkg/features:go_default_library", - "//pkg/master/ports:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library", diff --git a/cmd/kube-controller-manager/app/options/options.go b/cmd/kube-controller-manager/app/options/options.go index e36bc8ecde5..ef193128613 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -42,7 +42,7 @@ import ( kubectrlmgrconfigscheme "k8s.io/kubernetes/pkg/controller/apis/config/scheme" "k8s.io/kubernetes/pkg/controller/garbagecollector" garbagecollectorconfig "k8s.io/kubernetes/pkg/controller/garbagecollector/config" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" // add the kubernetes feature gates _ "k8s.io/kubernetes/pkg/features" diff --git a/cmd/kube-proxy/app/BUILD b/cmd/kube-proxy/app/BUILD index 4791670bdac..e76382f0986 100644 --- a/cmd/kube-proxy/app/BUILD +++ b/cmd/kube-proxy/app/BUILD @@ -19,9 +19,9 @@ go_library( importpath = "k8s.io/kubernetes/cmd/kube-proxy/app", deps = [ "//pkg/apis/core:go_default_library", + "//pkg/cluster/ports:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/qos:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/proxy:go_default_library", "//pkg/proxy/apis:go_default_library", "//pkg/proxy/apis/config:go_default_library", diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index c5739efd11b..3a989ca6bcc 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -64,7 +64,7 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/qos" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/proxy" "k8s.io/kubernetes/pkg/proxy/apis" kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config" diff --git a/cmd/kubelet/app/options/BUILD b/cmd/kubelet/app/options/BUILD index 7029cec3685..53932c63591 100644 --- a/cmd/kubelet/app/options/BUILD +++ b/cmd/kubelet/app/options/BUILD @@ -21,6 +21,7 @@ go_library( importpath = "k8s.io/kubernetes/cmd/kubelet/app/options", deps = [ "//pkg/apis/core:go_default_library", + "//pkg/cluster/ports:go_default_library", "//pkg/credentialprovider/azure:go_default_library", "//pkg/credentialprovider/gcp:go_default_library", "//pkg/features:go_default_library", @@ -30,7 +31,6 @@ go_library( "//pkg/kubelet/apis/config/validation:go_default_library", "//pkg/kubelet/config:go_default_library", "//pkg/kubelet/types:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/util/flag:go_default_library", "//pkg/util/taints:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/cmd/kubelet/app/options/options.go b/cmd/kubelet/app/options/options.go index 8306387ea8b..7dc419f250b 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -38,7 +38,7 @@ import ( kubeletscheme "k8s.io/kubernetes/pkg/kubelet/apis/config/scheme" kubeletconfigvalidation "k8s.io/kubernetes/pkg/kubelet/apis/config/validation" "k8s.io/kubernetes/pkg/kubelet/config" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" utilflag "k8s.io/kubernetes/pkg/util/flag" utiltaints "k8s.io/kubernetes/pkg/util/taints" ) diff --git a/cmd/kubemark/BUILD b/cmd/kubemark/BUILD index 1b84cf38f25..0c45169a4ea 100644 --- a/cmd/kubemark/BUILD +++ b/cmd/kubemark/BUILD @@ -17,12 +17,12 @@ go_library( importpath = "k8s.io/kubernetes/cmd/kubemark", deps = [ "//pkg/api/legacyscheme:go_default_library", + "//pkg/cluster/ports:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cri/remote:go_default_library", "//pkg/kubelet/cri/remote/fake:go_default_library", "//pkg/kubemark:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/util/iptables/testing:go_default_library", "//pkg/util/sysctl/testing:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index 79c915564c9..e00bb480179 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -46,7 +46,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/cri/remote" fakeremote "k8s.io/kubernetes/pkg/kubelet/cri/remote/fake" "k8s.io/kubernetes/pkg/kubemark" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing" fakesysctl "k8s.io/kubernetes/pkg/util/sysctl/testing" fakeexec "k8s.io/utils/exec/testing" diff --git a/pkg/BUILD b/pkg/BUILD index 4df371aec16..081a0da4ca4 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -54,6 +54,7 @@ filegroup( "//pkg/client/testdata:all-srcs", "//pkg/client/tests:all-srcs", "//pkg/cloudprovider:all-srcs", + "//pkg/cluster/ports:all-srcs", "//pkg/controller:all-srcs", "//pkg/credentialprovider:all-srcs", "//pkg/features:all-srcs", diff --git a/pkg/apis/core/validation/BUILD b/pkg/apis/core/validation/BUILD index 8fb48c2400b..ab1f47c34b3 100644 --- a/pkg/apis/core/validation/BUILD +++ b/pkg/apis/core/validation/BUILD @@ -22,9 +22,9 @@ go_library( "//pkg/apis/core/v1:go_default_library", "//pkg/apis/core/v1/helper:go_default_library", "//pkg/capabilities:go_default_library", + "//pkg/cluster/ports:go_default_library", "//pkg/features:go_default_library", "//pkg/fieldpath:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/security/apparmor:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/events/v1beta1:go_default_library", diff --git a/pkg/apis/core/validation/validation.go b/pkg/apis/core/validation/validation.go index 87e946293df..b6985e4e0af 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -54,7 +54,7 @@ import ( "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/fieldpath" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/security/apparmor" netutils "k8s.io/utils/net" ) diff --git a/pkg/master/ports/BUILD b/pkg/cluster/ports/BUILD similarity index 90% rename from pkg/master/ports/BUILD rename to pkg/cluster/ports/BUILD index 047289610e3..a2dc03628d3 100644 --- a/pkg/master/ports/BUILD +++ b/pkg/cluster/ports/BUILD @@ -11,7 +11,7 @@ go_library( "doc.go", "ports.go", ], - importpath = "k8s.io/kubernetes/pkg/master/ports", + importpath = "k8s.io/kubernetes/pkg/cluster/ports", deps = [ "//staging/src/k8s.io/cloud-provider:go_default_library", ], diff --git a/pkg/master/ports/doc.go b/pkg/cluster/ports/doc.go similarity index 91% rename from pkg/master/ports/doc.go rename to pkg/cluster/ports/doc.go index 5e14f82e716..0810294e0d4 100644 --- a/pkg/master/ports/doc.go +++ b/pkg/cluster/ports/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package ports defines ports used by various pieces of the kubernetes // infrastructure. -package ports // import "k8s.io/kubernetes/pkg/master/ports" +package ports // import "k8s.io/kubernetes/pkg/cluster/ports" diff --git a/pkg/master/ports/ports.go b/pkg/cluster/ports/ports.go similarity index 100% rename from pkg/master/ports/ports.go rename to pkg/cluster/ports/ports.go diff --git a/pkg/kubelet/apis/config/fuzzer/BUILD b/pkg/kubelet/apis/config/fuzzer/BUILD index 7dc2bea9742..5df1520ebb5 100644 --- a/pkg/kubelet/apis/config/fuzzer/BUILD +++ b/pkg/kubelet/apis/config/fuzzer/BUILD @@ -6,11 +6,11 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/apis/config/fuzzer", visibility = ["//visibility:public"], deps = [ + "//pkg/cluster/ports:go_default_library", "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/config/v1beta1:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/kubelet/types:go_default_library", - "//pkg/master/ports:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", "//staging/src/k8s.io/kubelet/config/v1beta1:go_default_library", diff --git a/pkg/kubelet/apis/config/fuzzer/fuzzer.go b/pkg/kubelet/apis/config/fuzzer/fuzzer.go index 3a05dae926f..212587a2df0 100644 --- a/pkg/kubelet/apis/config/fuzzer/fuzzer.go +++ b/pkg/kubelet/apis/config/fuzzer/fuzzer.go @@ -28,7 +28,7 @@ import ( kubeletconfigv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1" "k8s.io/kubernetes/pkg/kubelet/qos" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" ) // Funcs returns the fuzzer functions for the kubeletconfig apis. diff --git a/pkg/kubelet/apis/config/v1beta1/BUILD b/pkg/kubelet/apis/config/v1beta1/BUILD index 40aac29fe9c..66bc0bdd0d8 100644 --- a/pkg/kubelet/apis/config/v1beta1/BUILD +++ b/pkg/kubelet/apis/config/v1beta1/BUILD @@ -19,10 +19,10 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1", deps = [ + "//pkg/cluster/ports:go_default_library", "//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/kubelet/types:go_default_library", - "//pkg/master/ports:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/pkg/kubelet/apis/config/v1beta1/defaults.go b/pkg/kubelet/apis/config/v1beta1/defaults.go index 5cf26ad7a0d..f567be03669 100644 --- a/pkg/kubelet/apis/config/v1beta1/defaults.go +++ b/pkg/kubelet/apis/config/v1beta1/defaults.go @@ -26,7 +26,7 @@ import ( // TODO: Cut references to k8s.io/kubernetes, eventually there should be none from this package "k8s.io/kubernetes/pkg/kubelet/qos" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" utilpointer "k8s.io/utils/pointer" ) diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 7ed2daa55af..832df365697 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -201,7 +201,6 @@ filegroup( ":package-srcs", "//pkg/master/controller/clusterauthenticationtrust:all-srcs", "//pkg/master/controller/crdregistration:all-srcs", - "//pkg/master/ports:all-srcs", "//pkg/master/reconcilers:all-srcs", "//pkg/master/storageversionhashdata:all-srcs", "//pkg/master/tunneler:all-srcs", diff --git a/pkg/proxy/apis/config/v1alpha1/BUILD b/pkg/proxy/apis/config/v1alpha1/BUILD index d1f27332a41..3b5f9ea4c3c 100644 --- a/pkg/proxy/apis/config/v1alpha1/BUILD +++ b/pkg/proxy/apis/config/v1alpha1/BUILD @@ -17,8 +17,8 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/proxy/apis/config/v1alpha1", deps = [ + "//pkg/cluster/ports:go_default_library", "//pkg/kubelet/qos:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/proxy/apis/config:go_default_library", "//pkg/proxy/util:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/pkg/proxy/apis/config/v1alpha1/defaults.go b/pkg/proxy/apis/config/v1alpha1/defaults.go index 4831809bb0d..41d14db1ba9 100644 --- a/pkg/proxy/apis/config/v1alpha1/defaults.go +++ b/pkg/proxy/apis/config/v1alpha1/defaults.go @@ -26,7 +26,7 @@ import ( kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1" "k8s.io/kubernetes/pkg/kubelet/qos" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" proxyutil "k8s.io/kubernetes/pkg/proxy/util" "k8s.io/utils/pointer" ) diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD index d0bb9e8281e..42a6b13e17c 100644 --- a/pkg/registry/core/rest/BUILD +++ b/pkg/registry/core/rest/BUILD @@ -24,9 +24,9 @@ go_library( deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", + "//pkg/cluster/ports:go_default_library", "//pkg/features:go_default_library", "//pkg/kubelet/client:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/registry/core/componentstatus:go_default_library", "//pkg/registry/core/configmap/storage:go_default_library", "//pkg/registry/core/endpoint/storage:go_default_library", diff --git a/pkg/registry/core/rest/storage_core.go b/pkg/registry/core/rest/storage_core.go index 9cbfd2d64d5..e4d3235aa26 100644 --- a/pkg/registry/core/rest/storage_core.go +++ b/pkg/registry/core/rest/storage_core.go @@ -41,7 +41,7 @@ import ( api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/features" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/registry/core/componentstatus" configmapstore "k8s.io/kubernetes/pkg/registry/core/configmap/storage" endpointsstore "k8s.io/kubernetes/pkg/registry/core/endpoint/storage" diff --git a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_healthchecks.go b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_healthchecks.go index cf71eca28be..f65ddf6faf6 100644 --- a/staging/src/k8s.io/legacy-cloud-providers/gce/gce_healthchecks.go +++ b/staging/src/k8s.io/legacy-cloud-providers/gce/gce_healthchecks.go @@ -34,10 +34,10 @@ import ( const ( nodesHealthCheckPath = "/healthz" - // NOTE: Please keep the following port in sync with ProxyHealthzPort in pkg/master/ports/ports.go + // NOTE: Please keep the following port in sync with ProxyHealthzPort in pkg/cluster/ports/ports.go // ports.ProxyHealthzPort was not used here to avoid dependencies to k8s.io/kubernetes in the // GCE cloud provider which is required as part of the out-of-tree cloud provider efforts. - // TODO: use a shared constant once ports in pkg/master/ports are in a common external repo. + // TODO: use a shared constant once ports in pkg/cluster/ports are in a common external repo. lbNodesHealthCheckPort = 10256 ) diff --git a/test/e2e/apps/BUILD b/test/e2e/apps/BUILD index 957e001ca62..3bf6384c050 100644 --- a/test/e2e/apps/BUILD +++ b/test/e2e/apps/BUILD @@ -25,13 +25,13 @@ go_library( "//pkg/apis/batch:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/extensions:go_default_library", + "//pkg/cluster/ports:go_default_library", "//pkg/controller/daemon:go_default_library", "//pkg/controller/deployment/util:go_default_library", "//pkg/controller/job:go_default_library", "//pkg/controller/nodelifecycle:go_default_library", "//pkg/controller/replicaset:go_default_library", "//pkg/controller/replication:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", diff --git a/test/e2e/apps/daemon_restart.go b/test/e2e/apps/daemon_restart.go index ffcebaef8da..158e1dba10e 100644 --- a/test/e2e/apps/daemon_restart.go +++ b/test/e2e/apps/daemon_restart.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/watch" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" diff --git a/test/e2e/auth/BUILD b/test/e2e/auth/BUILD index 9ae0dceac48..602e0e4926f 100644 --- a/test/e2e/auth/BUILD +++ b/test/e2e/auth/BUILD @@ -14,7 +14,7 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/auth", visibility = ["//visibility:public"], deps = [ - "//pkg/master/ports:go_default_library", + "//pkg/cluster/ports:go_default_library", "//pkg/security/podsecuritypolicy/seccomp:go_default_library", "//pkg/security/podsecuritypolicy/util:go_default_library", "//plugin/pkg/admission/serviceaccount:go_default_library", diff --git a/test/e2e/auth/node_authn.go b/test/e2e/auth/node_authn.go index ebbb3710cbb..939f038108e 100644 --- a/test/e2e/auth/node_authn.go +++ b/test/e2e/auth/node_authn.go @@ -22,7 +22,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image" diff --git a/test/e2e/cloud/gcp/BUILD b/test/e2e/cloud/gcp/BUILD index de57647c018..d73edd6c174 100644 --- a/test/e2e/cloud/gcp/BUILD +++ b/test/e2e/cloud/gcp/BUILD @@ -17,7 +17,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/apis/core:go_default_library", - "//pkg/master/ports:go_default_library", + "//pkg/cluster/ports:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", diff --git a/test/e2e/cloud/gcp/kubelet_security.go b/test/e2e/cloud/gcp/kubelet_security.go index c424d20d511..99e9d2caf5f 100644 --- a/test/e2e/cloud/gcp/kubelet_security.go +++ b/test/e2e/cloud/gcp/kubelet_security.go @@ -23,7 +23,7 @@ import ( "time" v1 "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" e2enode "k8s.io/kubernetes/test/e2e/framework/node" diff --git a/test/e2e/framework/.import-restrictions b/test/e2e/framework/.import-restrictions index a5521e3a3e6..c6faeaaa071 100644 --- a/test/e2e/framework/.import-restrictions +++ b/test/e2e/framework/.import-restrictions @@ -160,7 +160,7 @@ rules: - k8s.io/kubernetes/pkg/kubelet/volumemanager/populator - k8s.io/kubernetes/pkg/kubelet/volumemanager/reconciler - k8s.io/kubernetes/pkg/kubemark - - k8s.io/kubernetes/pkg/master/ports + - k8s.io/kubernetes/pkg/cluster/ports - k8s.io/kubernetes/pkg/probe - k8s.io/kubernetes/pkg/probe/exec - k8s.io/kubernetes/pkg/probe/http diff --git a/test/e2e/framework/ports.go b/test/e2e/framework/ports.go index 58751074c88..8bb1e58a446 100644 --- a/test/e2e/framework/ports.go +++ b/test/e2e/framework/ports.go @@ -16,7 +16,7 @@ limitations under the License. package framework -// NOTE: constants in this file are copied from pkg/master/ports/ports.go +// NOTE: constants in this file are copied from pkg/cluster/ports/ports.go const ( // KubeletPort is the default port for the kubelet server on each host machine. diff --git a/test/e2e/network/BUILD b/test/e2e/network/BUILD index cd255fe8d4e..bdd1fd8bea5 100644 --- a/test/e2e/network/BUILD +++ b/test/e2e/network/BUILD @@ -39,7 +39,7 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/network", deps = [ "//pkg/apis/core:go_default_library", - "//pkg/master/ports:go_default_library", + "//pkg/cluster/ports:go_default_library", "//pkg/scheduler/apis/config:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/test/e2e/network/firewall.go b/test/e2e/network/firewall.go index f4200f5a30c..039e5bdd196 100644 --- a/test/e2e/network/firewall.go +++ b/test/e2e/network/firewall.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" cloudprovider "k8s.io/cloud-provider" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/test/e2e/framework" e2enetwork "k8s.io/kubernetes/test/e2e/framework/network" diff --git a/test/e2e/network/networking.go b/test/e2e/network/networking.go index 9b9400d451d..2e4bd63cd14 100644 --- a/test/e2e/network/networking.go +++ b/test/e2e/network/networking.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" utilwait "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/test/e2e/framework" e2enetwork "k8s.io/kubernetes/test/e2e/framework/network" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" diff --git a/test/e2e/node/BUILD b/test/e2e/node/BUILD index 141e3d44986..e2bbc48d295 100644 --- a/test/e2e/node/BUILD +++ b/test/e2e/node/BUILD @@ -24,9 +24,9 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/node", visibility = ["//visibility:public"], deps = [ + "//pkg/cluster/ports:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/runtimeclass/testing:go_default_library", - "//pkg/master/ports:go_default_library", "//pkg/util/slice:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/test/e2e/node/pre_stop.go b/test/e2e/node/pre_stop.go index a1391621d5e..fe3e38e7d25 100644 --- a/test/e2e/node/pre_stop.go +++ b/test/e2e/node/pre_stop.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" diff --git a/test/e2e/storage/vsphere/BUILD b/test/e2e/storage/vsphere/BUILD index feb45b9b60f..d6848660e29 100644 --- a/test/e2e/storage/vsphere/BUILD +++ b/test/e2e/storage/vsphere/BUILD @@ -39,8 +39,8 @@ go_library( ], importpath = "k8s.io/kubernetes/test/e2e/storage/vsphere", deps = [ + "//pkg/cluster/ports:go_default_library", "//pkg/controller/volume/events:go_default_library", - "//pkg/master/ports:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/storage/v1:go_default_library", diff --git a/test/e2e/storage/vsphere/vsphere_volume_master_restart.go b/test/e2e/storage/vsphere/vsphere_volume_master_restart.go index 04e4052047c..e4e8c643e5d 100644 --- a/test/e2e/storage/vsphere/vsphere_volume_master_restart.go +++ b/test/e2e/storage/vsphere/vsphere_volume_master_restart.go @@ -30,7 +30,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" clientset "k8s.io/client-go/kubernetes" - "k8s.io/kubernetes/pkg/master/ports" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod"