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/BUILD b/cmd/kube-apiserver/app/BUILD index 4f47775adfe..1cfb7c20a76 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -13,6 +13,10 @@ go_library( "//cmd/kube-apiserver/app/options:go_default_library", "//pkg/api/legacyscheme:go_default_library", "//pkg/capabilities:go_default_library", + "//pkg/controlplane:go_default_library", + "//pkg/controlplane/controller/crdregistration:go_default_library", + "//pkg/controlplane/reconcilers:go_default_library", + "//pkg/controlplane/tunneler:go_default_library", "//pkg/features:go_default_library", "//pkg/generated/openapi:go_default_library", "//pkg/kubeapiserver:go_default_library", @@ -21,10 +25,6 @@ go_library( "//pkg/kubeapiserver/authorizer/modes:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//pkg/kubeapiserver/server:go_default_library", - "//pkg/master:go_default_library", - "//pkg/master/controller/crdregistration:go_default_library", - "//pkg/master/reconcilers:go_default_library", - "//pkg/master/tunneler:go_default_library", "//pkg/registry/rbac/rest:go_default_library", "//pkg/serviceaccount:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1:go_default_library", diff --git a/cmd/kube-apiserver/app/aggregator.go b/cmd/kube-apiserver/app/aggregator.go index 38595535bed..14af4103ea5 100644 --- a/cmd/kube-apiserver/app/aggregator.go +++ b/cmd/kube-apiserver/app/aggregator.go @@ -50,7 +50,7 @@ import ( informers "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1" "k8s.io/kube-aggregator/pkg/controllers/autoregister" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" - "k8s.io/kubernetes/pkg/master/controller/crdregistration" + "k8s.io/kubernetes/pkg/controlplane/controller/crdregistration" ) func createAggregatorConfig( diff --git a/cmd/kube-apiserver/app/options/BUILD b/cmd/kube-apiserver/app/options/BUILD index 3e8edb7302e..5d7dc156eff 100644 --- a/cmd/kube-apiserver/app/options/BUILD +++ b/cmd/kube-apiserver/app/options/BUILD @@ -19,11 +19,11 @@ 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/controlplane/reconcilers: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", "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", @@ -52,10 +52,10 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/apis/core:go_default_library", + "//pkg/controlplane/reconcilers:go_default_library", "//pkg/features:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//pkg/kubelet/client:go_default_library", - "//pkg/master/reconcilers:go_default_library", "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library", "//staging/src/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library", diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 1434cc181b4..c7b8bb54958 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -29,11 +29,11 @@ import ( "k8s.io/component-base/logs" "k8s.io/component-base/metrics" api "k8s.io/kubernetes/pkg/apis/core" + "k8s.io/kubernetes/pkg/cluster/ports" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" _ "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/master/reconcilers" "k8s.io/kubernetes/pkg/serviceaccount" ) diff --git a/cmd/kube-apiserver/app/options/options_test.go b/cmd/kube-apiserver/app/options/options_test.go index 2149c0bed25..29e40727a4d 100644 --- a/cmd/kube-apiserver/app/options/options_test.go +++ b/cmd/kube-apiserver/app/options/options_test.go @@ -36,9 +36,9 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/component-base/metrics" kapi "k8s.io/kubernetes/pkg/apis/core" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/master/reconcilers" ) func TestAddFlags(t *testing.T) { diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index 1672cefd927..593a8e01411 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -68,6 +68,9 @@ import ( "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/controlplane" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/tunneler" "k8s.io/kubernetes/pkg/features" generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi" "k8s.io/kubernetes/pkg/kubeapiserver" @@ -76,9 +79,6 @@ import ( "k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeserver "k8s.io/kubernetes/pkg/kubeapiserver/server" - "k8s.io/kubernetes/pkg/master" - "k8s.io/kubernetes/pkg/master/reconcilers" - "k8s.io/kubernetes/pkg/master/tunneler" rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest" "k8s.io/kubernetes/pkg/serviceaccount" ) @@ -225,7 +225,7 @@ func CreateServerChain(completedOptions completedServerRunOptions, stopCh <-chan } // CreateKubeAPIServer creates and wires a workable kube-apiserver -func CreateKubeAPIServer(kubeAPIServerConfig *master.Config, delegateAPIServer genericapiserver.DelegationTarget) (*master.Master, error) { +func CreateKubeAPIServer(kubeAPIServerConfig *controlplane.Config, delegateAPIServer genericapiserver.DelegationTarget) (*controlplane.Master, error) { kubeAPIServer, err := kubeAPIServerConfig.Complete().New(delegateAPIServer) if err != nil { return nil, err @@ -287,7 +287,7 @@ func CreateKubeAPIServerConfig( nodeTunneler tunneler.Tunneler, proxyTransport *http.Transport, ) ( - *master.Config, + *controlplane.Config, *genericapiserver.DeprecatedInsecureServingInfo, aggregatorapiserver.ServiceResolver, []admission.PluginInitializer, @@ -320,7 +320,7 @@ func CreateKubeAPIServerConfig( s.Logs.Apply() - serviceIPRange, apiServerServiceIP, err := master.ServiceIPRange(s.PrimaryServiceClusterIPRange) + serviceIPRange, apiServerServiceIP, err := controlplane.ServiceIPRange(s.PrimaryServiceClusterIPRange) if err != nil { return nil, nil, nil, nil, err } @@ -329,15 +329,15 @@ func CreateKubeAPIServerConfig( var secondaryServiceIPRange net.IPNet // process secondary range only if provided by user if s.SecondaryServiceClusterIPRange.IP != nil { - secondaryServiceIPRange, _, err = master.ServiceIPRange(s.SecondaryServiceClusterIPRange) + secondaryServiceIPRange, _, err = controlplane.ServiceIPRange(s.SecondaryServiceClusterIPRange) if err != nil { return nil, nil, nil, nil, err } } - config := &master.Config{ + config := &controlplane.Config{ GenericConfig: genericConfig, - ExtraConfig: master.ExtraConfig{ + ExtraConfig: controlplane.ExtraConfig{ APIResourceConfigSource: storageFactory.APIResourceConfigSource, StorageFactory: storageFactory, EventTTL: s.EventTTL, @@ -442,7 +442,7 @@ func buildGenericConfig( lastErr error, ) { genericConfig = genericapiserver.NewConfig(legacyscheme.Codecs) - genericConfig.MergedResourceConfig = master.DefaultAPIResourceConfigSource() + genericConfig.MergedResourceConfig = controlplane.DefaultAPIResourceConfigSource() if lastErr = s.GenericServerRunOptions.ApplyTo(genericConfig); lastErr != nil { return @@ -457,7 +457,7 @@ func buildGenericConfig( if lastErr = s.Features.ApplyTo(genericConfig); lastErr != nil { return } - if lastErr = s.APIEnablement.ApplyTo(genericConfig, master.DefaultAPIResourceConfigSource(), legacyscheme.Scheme); lastErr != nil { + if lastErr = s.APIEnablement.ApplyTo(genericConfig, controlplane.DefaultAPIResourceConfigSource(), legacyscheme.Scheme); lastErr != nil { return } if lastErr = s.EgressSelector.ApplyTo(genericConfig); lastErr != nil { @@ -727,7 +727,7 @@ func getServiceIPAndRanges(serviceClusterIPRanges string) (net.IP, net.IPNet, ne // nothing provided by user, use default range (only applies to the Primary) if len(serviceClusterIPRangeList) == 0 { var primaryServiceClusterCIDR net.IPNet - primaryServiceIPRange, apiServerServiceIP, err = master.ServiceIPRange(primaryServiceClusterCIDR) + primaryServiceIPRange, apiServerServiceIP, err = controlplane.ServiceIPRange(primaryServiceClusterCIDR) if err != nil { return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges: %v", err) } @@ -740,7 +740,7 @@ func getServiceIPAndRanges(serviceClusterIPRanges string) (net.IP, net.IPNet, ne return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("service-cluster-ip-range[0] is not a valid cidr") } - primaryServiceIPRange, apiServerServiceIP, err = master.ServiceIPRange(*(primaryServiceClusterCIDR)) + primaryServiceIPRange, apiServerServiceIP, err = controlplane.ServiceIPRange(*(primaryServiceClusterCIDR)) if err != nil { return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges for primary service cidr: %v", err) } 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..ee6058cf626 100644 --- a/cmd/kube-controller-manager/app/options/options.go +++ b/cmd/kube-controller-manager/app/options/options.go @@ -38,11 +38,11 @@ import ( kubectrlmgrconfigv1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1" cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options" kubecontrollerconfig "k8s.io/kubernetes/cmd/kube-controller-manager/app/config" + "k8s.io/kubernetes/pkg/cluster/ports" kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config" 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" // 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..6976b9cae0e 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -62,9 +62,9 @@ import ( "k8s.io/klog/v2" "k8s.io/kube-proxy/config/v1alpha1" api "k8s.io/kubernetes/pkg/apis/core" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/kubelet/qos" - "k8s.io/kubernetes/pkg/master/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..a208b5ac9a0 100644 --- a/cmd/kubelet/app/options/options.go +++ b/cmd/kubelet/app/options/options.go @@ -32,13 +32,13 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/kubelet/config/v1beta1" "k8s.io/kubernetes/pkg/apis/core" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/features" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" 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" 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..a728313c08b 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -41,12 +41,12 @@ import ( "k8s.io/component-base/version" "k8s.io/component-base/version/verflag" "k8s.io/kubernetes/pkg/api/legacyscheme" + "k8s.io/kubernetes/pkg/cluster/ports" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" "k8s.io/kubernetes/pkg/kubelet/cm" "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" 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/hack/.golint_failures b/hack/.golint_failures index 4529abba3bb..b88d3e2be79 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -89,6 +89,8 @@ pkg/controller/volume/attachdetach/testing pkg/controller/volume/expand pkg/controller/volume/persistentvolume pkg/controller/volume/persistentvolume/config/v1alpha1 +pkg/controlplane/controller/crdregistration +pkg/controlplane/tunneler pkg/features pkg/kubeapiserver pkg/kubectl/cmd/convert @@ -109,8 +111,6 @@ pkg/kubelet/stats pkg/kubelet/sysctl pkg/kubelet/types pkg/kubemark -pkg/master/controller/crdregistration -pkg/master/tunneler pkg/proxy/apis/config pkg/proxy/apis/config/v1alpha1 pkg/proxy/userspace diff --git a/hack/verify-api-groups.sh b/hack/verify-api-groups.sh index ab5a10f86a5..4199bb44f8d 100755 --- a/hack/verify-api-groups.sh +++ b/hack/verify-api-groups.sh @@ -95,7 +95,7 @@ packages_without_install=( "k8s.io/kubernetes/pkg/apis/componentconfig" # TODO: Remove this package completely and from this list ) known_version_files=( - "pkg/master/import_known_versions.go" + "pkg/controlplane/import_known_versions.go" ) for expected_install_package in "${expected_install_packages[@]}"; do found=0 diff --git a/pkg/BUILD b/pkg/BUILD index 4df371aec16..3dde07b598c 100644 --- a/pkg/BUILD +++ b/pkg/BUILD @@ -54,7 +54,9 @@ 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/controlplane:all-srcs", "//pkg/credentialprovider:all-srcs", "//pkg/features:all-srcs", "//pkg/fieldpath:all-srcs", @@ -63,7 +65,6 @@ filegroup( "//pkg/kubectl:all-srcs", "//pkg/kubelet:all-srcs", "//pkg/kubemark:all-srcs", - "//pkg/master:all-srcs", "//pkg/printers:all-srcs", "//pkg/probe:all-srcs", "//pkg/proxy: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..2bce665f19c 100644 --- a/pkg/apis/core/validation/validation.go +++ b/pkg/apis/core/validation/validation.go @@ -52,9 +52,9 @@ import ( corev1 "k8s.io/kubernetes/pkg/apis/core/v1" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" "k8s.io/kubernetes/pkg/capabilities" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/fieldpath" - "k8s.io/kubernetes/pkg/master/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/master/BUILD b/pkg/controlplane/BUILD similarity index 94% rename from pkg/master/BUILD rename to pkg/controlplane/BUILD index 7ed2daa55af..8d50f063a3f 100644 --- a/pkg/master/BUILD +++ b/pkg/controlplane/BUILD @@ -10,7 +10,7 @@ go_library( "master.go", "services.go", ], - importpath = "k8s.io/kubernetes/pkg/master", + importpath = "k8s.io/kubernetes/pkg/controlplane", visibility = ["//visibility:public"], deps = [ "//pkg/apis/admission/install:go_default_library", @@ -36,12 +36,12 @@ go_library( "//pkg/apis/scheduling/install:go_default_library", "//pkg/apis/settings/install:go_default_library", "//pkg/apis/storage/install:go_default_library", + "//pkg/controlplane/controller/clusterauthenticationtrust:go_default_library", + "//pkg/controlplane/reconcilers:go_default_library", + "//pkg/controlplane/tunneler:go_default_library", "//pkg/features:go_default_library", "//pkg/kubeapiserver/options:go_default_library", "//pkg/kubelet/client:go_default_library", - "//pkg/master/controller/clusterauthenticationtrust:go_default_library", - "//pkg/master/reconcilers:go_default_library", - "//pkg/master/tunneler:go_default_library", "//pkg/registry/admissionregistration/rest:go_default_library", "//pkg/registry/apps/rest:go_default_library", "//pkg/registry/authentication/rest:go_default_library", @@ -149,10 +149,10 @@ go_test( "//pkg/apis/batch:go_default_library", "//pkg/apis/networking:go_default_library", "//pkg/apis/storage:go_default_library", + "//pkg/controlplane/reconcilers:go_default_library", + "//pkg/controlplane/storageversionhashdata:go_default_library", "//pkg/generated/openapi:go_default_library", "//pkg/kubelet/client:go_default_library", - "//pkg/master/reconcilers:go_default_library", - "//pkg/master/storageversionhashdata:go_default_library", "//pkg/registry/certificates/rest:go_default_library", "//pkg/registry/core/rest:go_default_library", "//pkg/registry/registrytest:go_default_library", @@ -199,12 +199,11 @@ filegroup( name = "all-srcs", srcs = [ ":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", + "//pkg/controlplane/controller/clusterauthenticationtrust:all-srcs", + "//pkg/controlplane/controller/crdregistration:all-srcs", + "//pkg/controlplane/reconcilers:all-srcs", + "//pkg/controlplane/storageversionhashdata:all-srcs", + "//pkg/controlplane/tunneler:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/pkg/master/OWNERS b/pkg/controlplane/OWNERS similarity index 100% rename from pkg/master/OWNERS rename to pkg/controlplane/OWNERS diff --git a/pkg/master/client_util.go b/pkg/controlplane/client_util.go similarity index 98% rename from pkg/master/client_util.go rename to pkg/controlplane/client_util.go index 689e2cc3352..20bf644b3cb 100644 --- a/pkg/master/client_util.go +++ b/pkg/controlplane/client_util.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "context" diff --git a/pkg/master/controller.go b/pkg/controlplane/controller.go similarity index 99% rename from pkg/master/controller.go rename to pkg/controlplane/controller.go index fdc9f10c19f..faa11983e10 100644 --- a/pkg/master/controller.go +++ b/pkg/controlplane/controller.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "context" @@ -34,7 +34,7 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/rest" "k8s.io/klog/v2" - "k8s.io/kubernetes/pkg/master/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" "k8s.io/kubernetes/pkg/registry/core/rangeallocation" corerest "k8s.io/kubernetes/pkg/registry/core/rest" servicecontroller "k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller" diff --git a/pkg/master/controller/clusterauthenticationtrust/BUILD b/pkg/controlplane/controller/clusterauthenticationtrust/BUILD similarity index 97% rename from pkg/master/controller/clusterauthenticationtrust/BUILD rename to pkg/controlplane/controller/clusterauthenticationtrust/BUILD index 481c611871b..88acd818952 100644 --- a/pkg/master/controller/clusterauthenticationtrust/BUILD +++ b/pkg/controlplane/controller/clusterauthenticationtrust/BUILD @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["cluster_authentication_trust_controller.go"], - importpath = "k8s.io/kubernetes/pkg/master/controller/clusterauthenticationtrust", + importpath = "k8s.io/kubernetes/pkg/controlplane/controller/clusterauthenticationtrust", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/master/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go b/pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go similarity index 100% rename from pkg/master/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go rename to pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go diff --git a/pkg/master/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go b/pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go similarity index 100% rename from pkg/master/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go rename to pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go diff --git a/pkg/master/controller/crdregistration/BUILD b/pkg/controlplane/controller/crdregistration/BUILD similarity index 96% rename from pkg/master/controller/crdregistration/BUILD rename to pkg/controlplane/controller/crdregistration/BUILD index d1fcb0fc595..16f7d212a5c 100644 --- a/pkg/master/controller/crdregistration/BUILD +++ b/pkg/controlplane/controller/crdregistration/BUILD @@ -9,7 +9,7 @@ load( go_library( name = "go_default_library", srcs = ["crdregistration_controller.go"], - importpath = "k8s.io/kubernetes/pkg/master/controller/crdregistration", + importpath = "k8s.io/kubernetes/pkg/controlplane/controller/crdregistration", deps = [ "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/client/informers/externalversions/apiextensions/v1:go_default_library", diff --git a/pkg/master/controller/crdregistration/crdregistration_controller.go b/pkg/controlplane/controller/crdregistration/crdregistration_controller.go similarity index 100% rename from pkg/master/controller/crdregistration/crdregistration_controller.go rename to pkg/controlplane/controller/crdregistration/crdregistration_controller.go diff --git a/pkg/master/controller/crdregistration/crdregistration_controller_test.go b/pkg/controlplane/controller/crdregistration/crdregistration_controller_test.go similarity index 100% rename from pkg/master/controller/crdregistration/crdregistration_controller_test.go rename to pkg/controlplane/controller/crdregistration/crdregistration_controller_test.go diff --git a/pkg/master/controller_test.go b/pkg/controlplane/controller_test.go similarity index 99% rename from pkg/master/controller_test.go rename to pkg/controlplane/controller_test.go index a54ee417960..8b68e958000 100644 --- a/pkg/master/controller_test.go +++ b/pkg/controlplane/controller_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "net" @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/master/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" ) func TestReconcileEndpoints(t *testing.T) { diff --git a/pkg/master/doc.go b/pkg/controlplane/doc.go similarity index 75% rename from pkg/master/doc.go rename to pkg/controlplane/doc.go index 2aae50ed368..9bb34fa9a9b 100644 --- a/pkg/master/doc.go +++ b/pkg/controlplane/doc.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Package master contains code for setting up and running a Kubernetes -// cluster master. -package master // import "k8s.io/kubernetes/pkg/master" +// Package controlplane contains code for setting up and running a Kubernetes +// cluster control plane API server. +package controlplane // import "k8s.io/kubernetes/pkg/controlplane" diff --git a/pkg/master/import_known_versions.go b/pkg/controlplane/import_known_versions.go similarity index 98% rename from pkg/master/import_known_versions.go rename to pkg/controlplane/import_known_versions.go index 5c71e5fca77..0c4976fa398 100644 --- a/pkg/master/import_known_versions.go +++ b/pkg/controlplane/import_known_versions.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( // These imports are the API groups the API server will support. diff --git a/pkg/master/import_known_versions_test.go b/pkg/controlplane/import_known_versions_test.go similarity index 99% rename from pkg/master/import_known_versions_test.go rename to pkg/controlplane/import_known_versions_test.go index a5ecc7638ce..9c39f13b411 100644 --- a/pkg/master/import_known_versions_test.go +++ b/pkg/controlplane/import_known_versions_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "reflect" diff --git a/pkg/master/master.go b/pkg/controlplane/master.go similarity index 99% rename from pkg/master/master.go rename to pkg/controlplane/master.go index faf03a21936..cf53bdf4bb1 100644 --- a/pkg/master/master.go +++ b/pkg/controlplane/master.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "context" @@ -79,12 +79,12 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" discoveryclient "k8s.io/client-go/kubernetes/typed/discovery/v1beta1" api "k8s.io/kubernetes/pkg/apis/core" + "k8s.io/kubernetes/pkg/controlplane/controller/clusterauthenticationtrust" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/tunneler" "k8s.io/kubernetes/pkg/features" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/master/controller/clusterauthenticationtrust" - "k8s.io/kubernetes/pkg/master/reconcilers" - "k8s.io/kubernetes/pkg/master/tunneler" "k8s.io/kubernetes/pkg/routes" "k8s.io/kubernetes/pkg/serviceaccount" nodeutil "k8s.io/kubernetes/pkg/util/node" diff --git a/pkg/master/master_openapi_test.go b/pkg/controlplane/master_openapi_test.go similarity index 99% rename from pkg/master/master_openapi_test.go rename to pkg/controlplane/master_openapi_test.go index beed6be5f01..8af7b7ccbe5 100644 --- a/pkg/master/master_openapi_test.go +++ b/pkg/controlplane/master_openapi_test.go @@ -16,7 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane // This test file is separated from master_test.go so we would be able to disable // race check for it. TestValidOpenAPISpec will became extremely slow if -race diff --git a/pkg/master/master_test.go b/pkg/controlplane/master_test.go similarity index 99% rename from pkg/master/master_test.go rename to pkg/controlplane/master_test.go index 05b64fbd688..014f70fafc6 100644 --- a/pkg/master/master_test.go +++ b/pkg/controlplane/master_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "context" @@ -51,9 +51,9 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/networking" apisstorage "k8s.io/kubernetes/pkg/apis/storage" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/storageversionhashdata" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/master/reconcilers" - "k8s.io/kubernetes/pkg/master/storageversionhashdata" certificatesrest "k8s.io/kubernetes/pkg/registry/certificates/rest" corerest "k8s.io/kubernetes/pkg/registry/core/rest" "k8s.io/kubernetes/pkg/registry/registrytest" diff --git a/pkg/master/reconcilers/BUILD b/pkg/controlplane/reconcilers/BUILD similarity index 97% rename from pkg/master/reconcilers/BUILD rename to pkg/controlplane/reconcilers/BUILD index ec54ef5b47b..ff2834f4499 100644 --- a/pkg/master/reconcilers/BUILD +++ b/pkg/controlplane/reconcilers/BUILD @@ -10,7 +10,7 @@ go_library( "none.go", "reconcilers.go", ], - importpath = "k8s.io/kubernetes/pkg/master/reconcilers", + importpath = "k8s.io/kubernetes/pkg/controlplane/reconcilers", visibility = ["//visibility:public"], deps = [ "//pkg/api/v1/endpoints:go_default_library", diff --git a/pkg/master/reconcilers/doc.go b/pkg/controlplane/reconcilers/doc.go similarity index 100% rename from pkg/master/reconcilers/doc.go rename to pkg/controlplane/reconcilers/doc.go diff --git a/pkg/master/reconcilers/endpointsadapter.go b/pkg/controlplane/reconcilers/endpointsadapter.go similarity index 100% rename from pkg/master/reconcilers/endpointsadapter.go rename to pkg/controlplane/reconcilers/endpointsadapter.go diff --git a/pkg/master/reconcilers/endpointsadapter_test.go b/pkg/controlplane/reconcilers/endpointsadapter_test.go similarity index 100% rename from pkg/master/reconcilers/endpointsadapter_test.go rename to pkg/controlplane/reconcilers/endpointsadapter_test.go diff --git a/pkg/master/reconcilers/lease.go b/pkg/controlplane/reconcilers/lease.go similarity index 100% rename from pkg/master/reconcilers/lease.go rename to pkg/controlplane/reconcilers/lease.go diff --git a/pkg/master/reconcilers/lease_test.go b/pkg/controlplane/reconcilers/lease_test.go similarity index 100% rename from pkg/master/reconcilers/lease_test.go rename to pkg/controlplane/reconcilers/lease_test.go diff --git a/pkg/master/reconcilers/mastercount.go b/pkg/controlplane/reconcilers/mastercount.go similarity index 100% rename from pkg/master/reconcilers/mastercount.go rename to pkg/controlplane/reconcilers/mastercount.go diff --git a/pkg/master/reconcilers/none.go b/pkg/controlplane/reconcilers/none.go similarity index 100% rename from pkg/master/reconcilers/none.go rename to pkg/controlplane/reconcilers/none.go diff --git a/pkg/master/reconcilers/reconcilers.go b/pkg/controlplane/reconcilers/reconcilers.go similarity index 100% rename from pkg/master/reconcilers/reconcilers.go rename to pkg/controlplane/reconcilers/reconcilers.go diff --git a/pkg/master/services.go b/pkg/controlplane/services.go similarity index 99% rename from pkg/master/services.go rename to pkg/controlplane/services.go index 972f25c404e..ca895764b4d 100644 --- a/pkg/master/services.go +++ b/pkg/controlplane/services.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package master +package controlplane import ( "fmt" diff --git a/pkg/master/storageversionhashdata/BUILD b/pkg/controlplane/storageversionhashdata/BUILD similarity index 87% rename from pkg/master/storageversionhashdata/BUILD rename to pkg/controlplane/storageversionhashdata/BUILD index 7eca8cf1e56..34eaf72e383 100644 --- a/pkg/master/storageversionhashdata/BUILD +++ b/pkg/controlplane/storageversionhashdata/BUILD @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["data.go"], - importpath = "k8s.io/kubernetes/pkg/master/storageversionhashdata", + importpath = "k8s.io/kubernetes/pkg/controlplane/storageversionhashdata", visibility = ["//visibility:public"], deps = ["//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library"], ) diff --git a/pkg/master/storageversionhashdata/OWNERS b/pkg/controlplane/storageversionhashdata/OWNERS similarity index 100% rename from pkg/master/storageversionhashdata/OWNERS rename to pkg/controlplane/storageversionhashdata/OWNERS diff --git a/pkg/master/storageversionhashdata/data.go b/pkg/controlplane/storageversionhashdata/data.go similarity index 100% rename from pkg/master/storageversionhashdata/data.go rename to pkg/controlplane/storageversionhashdata/data.go diff --git a/pkg/master/tunneler/BUILD b/pkg/controlplane/tunneler/BUILD similarity index 94% rename from pkg/master/tunneler/BUILD rename to pkg/controlplane/tunneler/BUILD index f6c7a435e75..2a5bfb426c8 100644 --- a/pkg/master/tunneler/BUILD +++ b/pkg/controlplane/tunneler/BUILD @@ -19,7 +19,7 @@ go_test( go_library( name = "go_default_library", srcs = ["ssh.go"], - importpath = "k8s.io/kubernetes/pkg/master/tunneler", + importpath = "k8s.io/kubernetes/pkg/controlplane/tunneler", deps = [ "//pkg/ssh:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library", diff --git a/pkg/master/tunneler/ssh.go b/pkg/controlplane/tunneler/ssh.go similarity index 100% rename from pkg/master/tunneler/ssh.go rename to pkg/controlplane/tunneler/ssh.go diff --git a/pkg/master/tunneler/ssh_test.go b/pkg/controlplane/tunneler/ssh_test.go similarity index 100% rename from pkg/master/tunneler/ssh_test.go rename to pkg/controlplane/tunneler/ssh_test.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..a1312f1a421 100644 --- a/pkg/kubelet/apis/config/fuzzer/fuzzer.go +++ b/pkg/kubelet/apis/config/fuzzer/fuzzer.go @@ -24,11 +24,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/kubelet/config/v1beta1" + "k8s.io/kubernetes/pkg/cluster/ports" kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config" 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" ) // 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..32935604c58 100644 --- a/pkg/kubelet/apis/config/v1beta1/defaults.go +++ b/pkg/kubelet/apis/config/v1beta1/defaults.go @@ -24,9 +24,9 @@ import ( componentbaseconfigv1alpha1 "k8s.io/component-base/config/v1alpha1" kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1" // TODO: Cut references to k8s.io/kubernetes, eventually there should be none from this package + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/kubelet/qos" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" - "k8s.io/kubernetes/pkg/master/ports" utilpointer "k8s.io/utils/pointer" ) 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..f80e1836a62 100644 --- a/pkg/proxy/apis/config/v1alpha1/defaults.go +++ b/pkg/proxy/apis/config/v1alpha1/defaults.go @@ -25,8 +25,8 @@ import ( kruntime "k8s.io/apimachinery/pkg/runtime" kubeproxyconfigv1alpha1 "k8s.io/kube-proxy/config/v1alpha1" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/kubelet/qos" - "k8s.io/kubernetes/pkg/master/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..feaff9d148e 100644 --- a/pkg/registry/core/rest/storage_core.go +++ b/pkg/registry/core/rest/storage_core.go @@ -39,9 +39,9 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" + "k8s.io/kubernetes/pkg/cluster/ports" "k8s.io/kubernetes/pkg/features" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/master/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/apiserver/pkg/endpoints/request/requestinfo.go b/staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go index 0890ae4ff1a..1f5dc28a9e1 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/request/requestinfo.go @@ -77,7 +77,7 @@ var specialVerbsNoSubresources = sets.NewString("proxy") // this list allows the parser to distinguish between a namespace subresource, and a namespaced resource var namespaceSubresources = sets.NewString("status", "finalize") -// NamespaceSubResourcesForTest exports namespaceSubresources for testing in pkg/master/master_test.go, so we never drift +// NamespaceSubResourcesForTest exports namespaceSubresources for testing in pkg/controlplane/master_test.go, so we never drift var NamespaceSubResourcesForTest = sets.NewString(namespaceSubresources.List()...) type RequestInfoFactory struct { 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" diff --git a/test/integration/apiserver/BUILD b/test/integration/apiserver/BUILD index acb3e4aaec0..bd02def97b2 100644 --- a/test/integration/apiserver/BUILD +++ b/test/integration/apiserver/BUILD @@ -24,8 +24,8 @@ go_test( deps = [ "//cmd/kube-apiserver/app/options:go_default_library", "//pkg/api/legacyscheme:go_default_library", + "//pkg/controlplane:go_default_library", "//pkg/features:go_default_library", - "//pkg/master:go_default_library", "//pkg/printers:go_default_library", "//pkg/printers/internalversion:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/test/integration/apiserver/apiserver_test.go b/test/integration/apiserver/apiserver_test.go index c93dd323e26..2de3f17e22b 100644 --- a/test/integration/apiserver/apiserver_test.go +++ b/test/integration/apiserver/apiserver_test.go @@ -62,7 +62,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration" "k8s.io/kubernetes/test/integration/framework" ) @@ -82,7 +82,7 @@ func setupWithResources(t *testing.T, groupVersions []schema.GroupVersion, resou func setupWithResourcesWithOptions(t *testing.T, opts *framework.MasterConfigOptions, groupVersions []schema.GroupVersion, resources []schema.GroupVersionResource) (*httptest.Server, clientset.Interface, framework.CloseFunc) { masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(opts) if len(groupVersions) > 0 || len(resources) > 0 { - resourceConfig := master.DefaultAPIResourceConfigSource() + resourceConfig := controlplane.DefaultAPIResourceConfigSource() resourceConfig.EnableVersions(groupVersions...) resourceConfig.EnableResources(resources...) masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig diff --git a/test/integration/apiserver/apply/BUILD b/test/integration/apiserver/apply/BUILD index 95754b1b8d0..db4a791b0be 100644 --- a/test/integration/apiserver/apply/BUILD +++ b/test/integration/apiserver/apply/BUILD @@ -15,7 +15,7 @@ go_test( ], deps = [ "//cmd/kube-apiserver/app/testing:go_default_library", - "//pkg/master:go_default_library", + "//pkg/controlplane: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/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", diff --git a/test/integration/apiserver/apply/apply_test.go b/test/integration/apiserver/apply/apply_test.go index f86b87d7944..a6e3d1fdffc 100644 --- a/test/integration/apiserver/apply/apply_test.go +++ b/test/integration/apiserver/apply/apply_test.go @@ -45,7 +45,7 @@ import ( clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" featuregatetesting "k8s.io/component-base/featuregate/testing" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration/framework" ) @@ -54,7 +54,7 @@ func setup(t testing.TB, groupVersions ...schema.GroupVersion) (*httptest.Server opts.EtcdOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf" masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(&opts) if len(groupVersions) > 0 { - resourceConfig := master.DefaultAPIResourceConfigSource() + resourceConfig := controlplane.DefaultAPIResourceConfigSource() resourceConfig.EnableVersions(groupVersions...) masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig } diff --git a/test/integration/apiserver/flowcontrol/BUILD b/test/integration/apiserver/flowcontrol/BUILD index fb107f7abb0..c3a5f990538 100644 --- a/test/integration/apiserver/flowcontrol/BUILD +++ b/test/integration/apiserver/flowcontrol/BUILD @@ -8,7 +8,7 @@ go_test( ], tags = ["integration"], deps = [ - "//pkg/master:go_default_library", + "//pkg/controlplane:go_default_library", "//staging/src/k8s.io/api/flowcontrol/v1alpha1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", diff --git a/test/integration/apiserver/flowcontrol/concurrency_test.go b/test/integration/apiserver/flowcontrol/concurrency_test.go index bb30315a32f..0e1d440ea3e 100644 --- a/test/integration/apiserver/flowcontrol/concurrency_test.go +++ b/test/integration/apiserver/flowcontrol/concurrency_test.go @@ -37,7 +37,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" featuregatetesting "k8s.io/component-base/featuregate/testing" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration/framework" ) @@ -53,7 +53,7 @@ func setup(t testing.TB) (*httptest.Server, *rest.Config, framework.CloseFunc) { opts := framework.MasterConfigOptions{EtcdOptions: framework.DefaultEtcdOptions()} opts.EtcdOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf" masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(&opts) - resourceConfig := master.DefaultAPIResourceConfigSource() + resourceConfig := controlplane.DefaultAPIResourceConfigSource() resourceConfig.EnableVersions(schema.GroupVersion{ Group: "flowcontrol.apiserver.k8s.io", Version: "v1alpha1", diff --git a/test/integration/auth/BUILD b/test/integration/auth/BUILD index 69d269f6790..51101de4f6d 100644 --- a/test/integration/auth/BUILD +++ b/test/integration/auth/BUILD @@ -31,9 +31,9 @@ go_test( "//pkg/auth/authorizer/abac:go_default_library", "//pkg/controller:go_default_library", "//pkg/controller/serviceaccount:go_default_library", + "//pkg/controlplane:go_default_library", "//pkg/features:go_default_library", "//pkg/kubeapiserver/options:go_default_library", - "//pkg/master:go_default_library", "//pkg/registry/rbac/clusterrole:go_default_library", "//pkg/registry/rbac/clusterrole/storage:go_default_library", "//pkg/registry/rbac/clusterrolebinding:go_default_library", diff --git a/test/integration/auth/dynamic_client_test.go b/test/integration/auth/dynamic_client_test.go index 6797260a26d..0c1e2e1a0a4 100644 --- a/test/integration/auth/dynamic_client_test.go +++ b/test/integration/auth/dynamic_client_test.go @@ -32,9 +32,9 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/controller" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/pkg/features" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" - "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/test/integration/framework" ) @@ -77,7 +77,7 @@ func TestDynamicClientBuilder(t *testing.T) { opts.Authentication.ServiceAccounts.Issuer = iss opts.Authentication.ServiceAccounts.KeyFiles = []string{tmpfile.Name()} }, - ModifyServerConfig: func(config *master.Config) { + ModifyServerConfig: func(config *controlplane.Config) { config.GenericConfig.Authorization.Authorizer = authorizerfactory.NewAlwaysAllowAuthorizer() }, }) diff --git a/test/integration/auth/rbac_test.go b/test/integration/auth/rbac_test.go index 6704903f0d9..0286537ac22 100644 --- a/test/integration/auth/rbac_test.go +++ b/test/integration/auth/rbac_test.go @@ -49,7 +49,7 @@ import ( "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/api/legacyscheme" rbachelper "k8s.io/kubernetes/pkg/apis/rbac/v1" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" clusterrolestore "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/storage" "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding" @@ -78,7 +78,7 @@ func clientsetForToken(user string, config *restclient.Config) (clientset.Interf } type testRESTOptionsGetter struct { - config *master.Config + config *controlplane.Config } func (getter *testRESTOptionsGetter) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) { @@ -89,7 +89,7 @@ func (getter *testRESTOptionsGetter) GetRESTOptions(resource schema.GroupResourc return generic.RESTOptions{StorageConfig: storageConfig, Decorator: generic.UndecoratedStorage, ResourcePrefix: resource.Resource}, nil } -func newRBACAuthorizer(t *testing.T, config *master.Config) authorizer.Authorizer { +func newRBACAuthorizer(t *testing.T, config *controlplane.Config) authorizer.Authorizer { optsGetter := &testRESTOptionsGetter{config} roleRest, err := rolestore.NewREST(optsGetter) if err != nil { diff --git a/test/integration/etcd/BUILD b/test/integration/etcd/BUILD index 921bd26b8f5..1825b20d325 100644 --- a/test/integration/etcd/BUILD +++ b/test/integration/etcd/BUILD @@ -64,8 +64,8 @@ go_library( deps = [ "//cmd/kube-apiserver/app:go_default_library", "//cmd/kube-apiserver/app/options:go_default_library", + "//pkg/controlplane:go_default_library", "//pkg/features:go_default_library", - "//pkg/master:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", diff --git a/test/integration/etcd/server.go b/test/integration/etcd/server.go index 8ef6645aabf..783a33c50bc 100644 --- a/test/integration/etcd/server.go +++ b/test/integration/etcd/server.go @@ -50,7 +50,7 @@ import ( "k8s.io/kubernetes/test/integration/framework" // install all APIs - _ "k8s.io/kubernetes/pkg/master" + _ "k8s.io/kubernetes/pkg/controlplane" ) // StartRealMasterOrDie starts an API master that is appropriate for use in tests that require one of every resource diff --git a/test/integration/examples/BUILD b/test/integration/examples/BUILD index ad570278869..e3ecd38bb61 100644 --- a/test/integration/examples/BUILD +++ b/test/integration/examples/BUILD @@ -17,8 +17,8 @@ go_test( deps = [ "//cmd/kube-apiserver/app/options:go_default_library", "//cmd/kube-apiserver/app/testing:go_default_library", - "//pkg/master:go_default_library", - "//pkg/master/reconcilers:go_default_library", + "//pkg/controlplane:go_default_library", + "//pkg/controlplane/reconcilers:go_default_library", "//staging/src/k8s.io/api/admissionregistration/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/test/integration/examples/webhook_test.go b/test/integration/examples/webhook_test.go index e81f7c5e181..cbf60fc5ac0 100644 --- a/test/integration/examples/webhook_test.go +++ b/test/integration/examples/webhook_test.go @@ -29,8 +29,8 @@ import ( auditinternal "k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" - "k8s.io/kubernetes/pkg/master" - "k8s.io/kubernetes/pkg/master/reconcilers" + "k8s.io/kubernetes/pkg/controlplane" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" "k8s.io/kubernetes/test/integration/framework" ) @@ -45,7 +45,7 @@ func TestWebhookLoopback(t *testing.T) { client, _ := framework.StartTestServer(t, stopCh, framework.TestServerSetup{ ModifyServerRunOptions: func(opts *options.ServerRunOptions) { }, - ModifyServerConfig: func(config *master.Config) { + ModifyServerConfig: func(config *controlplane.Config) { // Avoid resolveable kubernetes service config.ExtraConfig.EndpointReconcilerType = reconcilers.NoneEndpointReconcilerType diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index 1fcca66df63..486199c747e 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -40,10 +40,10 @@ go_library( "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core/v1/helper:go_default_library", "//pkg/controller/nodelifecycle:go_default_library", + "//pkg/controlplane:go_default_library", "//pkg/generated/openapi:go_default_library", "//pkg/kubeapiserver:go_default_library", "//pkg/kubelet/client:go_default_library", - "//pkg/master:go_default_library", "//pkg/util/env:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 444d7b06fea..fdb71226a06 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -53,16 +53,16 @@ import ( "k8s.io/klog/v2" openapicommon "k8s.io/kube-openapi/pkg/common" "k8s.io/kubernetes/pkg/api/legacyscheme" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/pkg/generated/openapi" "k8s.io/kubernetes/pkg/kubeapiserver" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/master" ) // Config is a struct of configuration directives for NewMasterComponents. type Config struct { // If nil, a default is used, partially filled configs will not get populated. - MasterConfig *master.Config + MasterConfig *controlplane.Config StartReplicationManager bool // Client throttling qps QPS float32 @@ -89,17 +89,17 @@ func alwaysEmpty(req *http.Request) (*authauthenticator.Response, bool, error) { // MasterReceiver can be used to provide the master to a custom incoming server function type MasterReceiver interface { - SetMaster(m *master.Master) + SetMaster(m *controlplane.Master) } // MasterHolder implements type MasterHolder struct { Initialized chan struct{} - M *master.Master + M *controlplane.Master } // SetMaster assigns the current master. -func (h *MasterHolder) SetMaster(m *master.Master) { +func (h *MasterHolder) SetMaster(m *controlplane.Master) { h.M = m close(h.Initialized) } @@ -124,8 +124,8 @@ func DefaultOpenAPIConfig() *openapicommon.Config { } // startMasterOrDie starts a kubernetes master and an httpserver to handle api requests -func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Server, masterReceiver MasterReceiver) (*master.Master, *httptest.Server, CloseFunc) { - var m *master.Master +func startMasterOrDie(masterConfig *controlplane.Config, incomingServer *httptest.Server, masterReceiver MasterReceiver) (*controlplane.Master, *httptest.Server, CloseFunc) { + var m *controlplane.Master var s *httptest.Server // Ensure we log at least level 4 @@ -249,16 +249,16 @@ func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Serv } // NewIntegrationTestMasterConfig returns the master config appropriate for most integration tests. -func NewIntegrationTestMasterConfig() *master.Config { +func NewIntegrationTestMasterConfig() *controlplane.Config { return NewIntegrationTestMasterConfigWithOptions(&MasterConfigOptions{}) } // NewIntegrationTestMasterConfigWithOptions returns the master config appropriate for most integration tests // configured with the provided options. -func NewIntegrationTestMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config { +func NewIntegrationTestMasterConfigWithOptions(opts *MasterConfigOptions) *controlplane.Config { masterConfig := NewMasterConfigWithOptions(opts) masterConfig.GenericConfig.PublicAddress = net.ParseIP("192.168.10.4") - masterConfig.ExtraConfig.APIResourceConfigSource = master.DefaultAPIResourceConfigSource() + masterConfig.ExtraConfig.APIResourceConfigSource = controlplane.DefaultAPIResourceConfigSource() // TODO: get rid of these tests or port them to secure serving masterConfig.GenericConfig.SecureServing = &genericapiserver.SecureServingInfo{Listener: fakeLocalhost443Listener{}} @@ -282,12 +282,12 @@ func DefaultEtcdOptions() *options.EtcdOptions { } // NewMasterConfig returns a basic master config. -func NewMasterConfig() *master.Config { +func NewMasterConfig() *controlplane.Config { return NewMasterConfigWithOptions(&MasterConfigOptions{}) } // NewMasterConfigWithOptions returns a basic master config configured with the provided options. -func NewMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config { +func NewMasterConfigWithOptions(opts *MasterConfigOptions) *controlplane.Config { etcdOptions := DefaultEtcdOptions() if opts.EtcdOptions != nil { etcdOptions = opts.EtcdOptions @@ -317,10 +317,10 @@ func NewMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config { panic(err) } - return &master.Config{ + return &controlplane.Config{ GenericConfig: genericConfig, - ExtraConfig: master.ExtraConfig{ - APIResourceConfigSource: master.DefaultAPIResourceConfigSource(), + ExtraConfig: controlplane.ExtraConfig{ + APIResourceConfigSource: controlplane.DefaultAPIResourceConfigSource(), StorageFactory: storageFactory, KubeletClientConfig: kubeletclient.KubeletClientConfig{Port: 10250}, APIServerServicePort: 443, @@ -333,7 +333,7 @@ func NewMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config { type CloseFunc func() // RunAMaster starts a master with the provided config. -func RunAMaster(masterConfig *master.Config) (*master.Master, *httptest.Server, CloseFunc) { +func RunAMaster(masterConfig *controlplane.Config) (*controlplane.Master, *httptest.Server, CloseFunc) { if masterConfig == nil { masterConfig = NewMasterConfig() masterConfig.GenericConfig.EnableProfiling = true @@ -342,7 +342,7 @@ func RunAMaster(masterConfig *master.Config) (*master.Master, *httptest.Server, } // RunAMasterUsingServer starts up a master using the provided config on the specified server. -func RunAMasterUsingServer(masterConfig *master.Config, s *httptest.Server, masterReceiver MasterReceiver) (*master.Master, *httptest.Server, CloseFunc) { +func RunAMasterUsingServer(masterConfig *controlplane.Config, s *httptest.Server, masterReceiver MasterReceiver) (*controlplane.Master, *httptest.Server, CloseFunc) { return startMasterOrDie(masterConfig, s, masterReceiver) } diff --git a/test/integration/framework/test_server.go b/test/integration/framework/test_server.go index 5dea71572fc..6e975610738 100644 --- a/test/integration/framework/test_server.go +++ b/test/integration/framework/test_server.go @@ -37,14 +37,14 @@ import ( "k8s.io/client-go/util/cert" "k8s.io/kubernetes/cmd/kube-apiserver/app" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/utils" ) // TestServerSetup holds configuration information for a kube-apiserver test server. type TestServerSetup struct { ModifyServerRunOptions func(*options.ServerRunOptions) - ModifyServerConfig func(*master.Config) + ModifyServerConfig func(*controlplane.Config) } // StartTestServer runs a kube-apiserver, optionally calling out to the setup.ModifyServerRunOptions and setup.ModifyServerConfig functions diff --git a/test/integration/master/BUILD b/test/integration/master/BUILD index d4dadca68f3..f6b1ad3b98b 100644 --- a/test/integration/master/BUILD +++ b/test/integration/master/BUILD @@ -24,7 +24,7 @@ go_test( tags = ["integration"], deps = [ "//cmd/kube-apiserver/app/testing:go_default_library", - "//pkg/master:go_default_library", + "//pkg/controlplane:go_default_library", "//staging/src/k8s.io/api/admission/v1beta1:go_default_library", "//staging/src/k8s.io/api/admissionregistration/v1beta1:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/test/integration/master/synthetic_master_test.go b/test/integration/master/synthetic_master_test.go index 2c29cfb59cd..ed15481c702 100644 --- a/test/integration/master/synthetic_master_test.go +++ b/test/integration/master/synthetic_master_test.go @@ -48,7 +48,7 @@ import ( clientset "k8s.io/client-go/kubernetes" clienttypedv1 "k8s.io/client-go/kubernetes/typed/core/v1" restclient "k8s.io/client-go/rest" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration" "k8s.io/kubernetes/test/integration/framework" ) @@ -143,13 +143,13 @@ func TestEmptyList(t *testing.T) { } } -func initStatusForbiddenMasterCongfig() *master.Config { +func initStatusForbiddenMasterCongfig() *controlplane.Config { masterConfig := framework.NewIntegrationTestMasterConfig() masterConfig.GenericConfig.Authorization.Authorizer = authorizerfactory.NewAlwaysDenyAuthorizer() return masterConfig } -func initUnauthorizedMasterCongfig() *master.Config { +func initUnauthorizedMasterCongfig() *controlplane.Config { masterConfig := framework.NewIntegrationTestMasterConfig() tokenAuthenticator := tokentest.New() tokenAuthenticator.Tokens[AliceToken] = &user.DefaultInfo{Name: "alice", UID: "1"} @@ -162,7 +162,7 @@ func initUnauthorizedMasterCongfig() *master.Config { func TestStatus(t *testing.T) { testCases := []struct { name string - masterConfig *master.Config + masterConfig *controlplane.Config statusCode int reqPath string reason string diff --git a/test/integration/openshift/BUILD b/test/integration/openshift/BUILD index 742b1a5414b..043a0537c86 100644 --- a/test/integration/openshift/BUILD +++ b/test/integration/openshift/BUILD @@ -14,7 +14,7 @@ go_test( ], tags = ["integration"], deps = [ - "//pkg/master:go_default_library", + "//pkg/controlplane:go_default_library", "//staging/src/k8s.io/apiserver/pkg/server:go_default_library", "//test/integration/framework:go_default_library", ], diff --git a/test/integration/openshift/openshift_test.go b/test/integration/openshift/openshift_test.go index 2bbb7fd50ea..830769d5226 100644 --- a/test/integration/openshift/openshift_test.go +++ b/test/integration/openshift/openshift_test.go @@ -20,21 +20,21 @@ import ( "testing" genericapiserver "k8s.io/apiserver/pkg/server" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" ) // This test references methods that OpenShift uses to customize the master on startup, that // are not referenced directly by a master. func TestMasterExportsSymbols(t *testing.T) { - _ = &master.Config{ + _ = &controlplane.Config{ GenericConfig: &genericapiserver.Config{ EnableMetrics: true, }, - ExtraConfig: master.ExtraConfig{ + ExtraConfig: controlplane.ExtraConfig{ EnableLogsSupport: false, }, } - _ = &master.Master{ + _ = &controlplane.Master{ GenericAPIServer: &genericapiserver.GenericAPIServer{}, } } diff --git a/test/integration/volumescheduling/BUILD b/test/integration/volumescheduling/BUILD index 66a834f42ae..c3f63f0ab3d 100644 --- a/test/integration/volumescheduling/BUILD +++ b/test/integration/volumescheduling/BUILD @@ -59,8 +59,8 @@ go_library( importpath = "k8s.io/kubernetes/test/integration/volumescheduling", deps = [ "//pkg/api/v1/pod:go_default_library", + "//pkg/controlplane:go_default_library", "//pkg/features:go_default_library", - "//pkg/master:go_default_library", "//pkg/scheduler:go_default_library", "//pkg/scheduler/profile:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/test/integration/volumescheduling/util.go b/test/integration/volumescheduling/util.go index 7c5cf94a207..10431f5fc40 100644 --- a/test/integration/volumescheduling/util.go +++ b/test/integration/volumescheduling/util.go @@ -35,8 +35,8 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/events" podutil "k8s.io/kubernetes/pkg/api/v1/pod" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/master" "k8s.io/kubernetes/pkg/scheduler" "k8s.io/kubernetes/pkg/scheduler/profile" "k8s.io/kubernetes/test/integration/framework" @@ -72,7 +72,7 @@ func initTestMaster(t *testing.T, nsPrefix string, admission admission.Interface })) masterConfig := framework.NewIntegrationTestMasterConfig() - resourceConfig := master.DefaultAPIResourceConfigSource() + resourceConfig := controlplane.DefaultAPIResourceConfigSource() if utilfeature.DefaultFeatureGate.Enabled(features.CSIStorageCapacity) { resourceConfig.EnableVersions(schema.GroupVersion{ Group: "storage.k8s.io",