Merge pull request #94407 from lavalamp/big-rename

Control Plane is a better name
2025-07-21 10:51:29 +00:00 · 2020-09-02 14:49:55 -07:00 · 2020-09-02 14:49:55 -07:00 · 0455c2d5e7
commit 0455c2d5e7
parent 09851c014f 9eb664f88a
103 changed files with 158 additions and 158 deletions
--- 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
--- 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",
--- 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(
--- 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",
--- 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"
 )

--- 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) {
--- 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)
 		}
--- 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",
--- 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"
--- 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",
--- 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"
--- 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",
--- 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"
 )
--- 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",
--- 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"
--- 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
--- 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
--- 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",
--- 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",
--- 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"
 )
--- a/pkg/cluster/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",
    ],
--- a/pkg/cluster/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"
--- a/pkg/cluster/ports/ports.go
+++ b/pkg/cluster/ports/ports.go
--- a/pkg/controlplane/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"],
--- a/pkg/controlplane/OWNERS
+++ b/pkg/controlplane/OWNERS
--- a/pkg/controlplane/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"
--- a/pkg/controlplane/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"
--- a/pkg/controlplane/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",
--- a/pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go
+++ b/pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller.go
--- a/pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go
+++ b/pkg/controlplane/controller/clusterauthenticationtrust/cluster_authentication_trust_controller_test.go
--- a/pkg/controlplane/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",
--- a/pkg/controlplane/controller/crdregistration/crdregistration_controller.go
+++ b/pkg/controlplane/controller/crdregistration/crdregistration_controller.go
--- a/pkg/controlplane/controller/crdregistration/crdregistration_controller_test.go
+++ b/pkg/controlplane/controller/crdregistration/crdregistration_controller_test.go
--- a/pkg/controlplane/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) {
--- a/pkg/controlplane/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"
--- a/pkg/controlplane/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.
--- a/pkg/controlplane/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"
--- a/pkg/controlplane/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"
--- a/pkg/controlplane/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
--- a/pkg/controlplane/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"
--- a/pkg/controlplane/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",
--- a/pkg/controlplane/reconcilers/doc.go
+++ b/pkg/controlplane/reconcilers/doc.go
--- a/pkg/controlplane/reconcilers/endpointsadapter.go
+++ b/pkg/controlplane/reconcilers/endpointsadapter.go
--- a/pkg/controlplane/reconcilers/endpointsadapter_test.go
+++ b/pkg/controlplane/reconcilers/endpointsadapter_test.go
--- a/pkg/controlplane/reconcilers/lease.go
+++ b/pkg/controlplane/reconcilers/lease.go
--- a/pkg/controlplane/reconcilers/lease_test.go
+++ b/pkg/controlplane/reconcilers/lease_test.go
--- a/pkg/controlplane/reconcilers/mastercount.go
+++ b/pkg/controlplane/reconcilers/mastercount.go
--- a/pkg/controlplane/reconcilers/none.go
+++ b/pkg/controlplane/reconcilers/none.go
--- a/pkg/controlplane/reconcilers/reconcilers.go
+++ b/pkg/controlplane/reconcilers/reconcilers.go
--- a/pkg/controlplane/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"
--- a/pkg/controlplane/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"],
 )
--- a/pkg/controlplane/storageversionhashdata/OWNERS
+++ b/pkg/controlplane/storageversionhashdata/OWNERS
--- a/pkg/controlplane/storageversionhashdata/data.go
+++ b/pkg/controlplane/storageversionhashdata/data.go
--- a/pkg/controlplane/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",
--- a/pkg/controlplane/tunneler/ssh.go
+++ b/pkg/controlplane/tunneler/ssh.go
--- a/pkg/controlplane/tunneler/ssh_test.go
+++ b/pkg/controlplane/tunneler/ssh_test.go
--- 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",
--- 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.
--- 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",
--- 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"
 )

--- 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",
--- 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"
 )
--- 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",
--- 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"
--- 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 {
--- 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
 )

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

--- 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",
--- 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"
--- 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
--- 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.
--- 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",
--- 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"
--- 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"
--- 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",
--- 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"
--- 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",
--- 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"
--- 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",
--- 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
--- 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",
--- 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
 	}
--- 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",
--- 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",
--- 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",
--- 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()
 		},
 	})
--- 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 {
--- 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",
--- 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
--- 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",
--- 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

--- 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",
--- 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)
 }

--- 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
--- 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",
--- 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
--- 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",
    ],
--- a/Show More
+++ b/Show More