update scripts

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

cmd/kube-apiserver/app/options/BUILD

@@ -20,10 +20,10 @@ go_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/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",

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/cluster/ports"
-	"k8s.io/kubernetes/pkg/controlplane/reconcilers"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 )
 

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/controlplane/reconcilers"
 )
 
 func TestAddFlags(t *testing.T) {

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/controlplane"
-	"k8s.io/kubernetes/pkg/controlplane/reconcilers"
-	"k8s.io/kubernetes/pkg/controlplane/tunneler"
 	rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 )

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/cluster/ports"
 
 	// add the kubernetes feature gates
 	_ "k8s.io/kubernetes/pkg/features"

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/cluster/ports"
 	"k8s.io/kubernetes/pkg/proxy"
 	"k8s.io/kubernetes/pkg/proxy/apis"
 	kubeproxyconfig "k8s.io/kubernetes/pkg/proxy/apis/config"

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/cluster/ports"
 	utilflag "k8s.io/kubernetes/pkg/util/flag"
 	utiltaints "k8s.io/kubernetes/pkg/util/taints"
 )

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/cluster/ports"
 	fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing"
 	fakesysctl "k8s.io/kubernetes/pkg/util/sysctl/testing"
 	fakeexec "k8s.io/utils/exec/testing"

pkg/BUILD

@@ -56,6 +56,7 @@ filegroup(
         "//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",
@@ -64,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",

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/cluster/ports"
 	"k8s.io/kubernetes/pkg/security/apparmor"
 	netutils "k8s.io/utils/net"
 )

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,11 +199,11 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/master/controller/clusterauthenticationtrust:all-srcs",
+        "//pkg/controlplane/controller/clusterauthenticationtrust:all-srcs",
-        "//pkg/master/controller/crdregistration:all-srcs",
+        "//pkg/controlplane/controller/crdregistration:all-srcs",
-        "//pkg/master/reconcilers:all-srcs",
+        "//pkg/controlplane/reconcilers:all-srcs",
-        "//pkg/master/storageversionhashdata:all-srcs",
+        "//pkg/controlplane/storageversionhashdata:all-srcs",
-        "//pkg/master/tunneler:all-srcs",
+        "//pkg/controlplane/tunneler:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

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

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

pkg/controlplane/master.go

@@ -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/features"
-	kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
-	kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
 	"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/routes"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 	nodeutil "k8s.io/kubernetes/pkg/util/node"

pkg/controlplane/master_test.go

@@ -51,9 +51,9 @@ import (
 	"k8s.io/kubernetes/pkg/apis/batch"
 	"k8s.io/kubernetes/pkg/apis/networking"
 	apisstorage "k8s.io/kubernetes/pkg/apis/storage"
-	kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
 	"k8s.io/kubernetes/pkg/controlplane/reconcilers"
 	"k8s.io/kubernetes/pkg/controlplane/storageversionhashdata"
+	kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
 	certificatesrest "k8s.io/kubernetes/pkg/registry/certificates/rest"
 	corerest "k8s.io/kubernetes/pkg/registry/core/rest"
 	"k8s.io/kubernetes/pkg/registry/registrytest"

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

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

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

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/cluster/ports"
 )
 
 // Funcs returns the fuzzer functions for the kubeletconfig apis.

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/cluster/ports"
 	utilpointer "k8s.io/utils/pointer"
 )
 

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/kubelet/qos"
 	"k8s.io/kubernetes/pkg/cluster/ports"
+	"k8s.io/kubernetes/pkg/kubelet/qos"
 	proxyutil "k8s.io/kubernetes/pkg/proxy/util"
 	"k8s.io/utils/pointer"
 )

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/cluster/ports"
 	"k8s.io/kubernetes/pkg/registry/core/componentstatus"
 	configmapstore "k8s.io/kubernetes/pkg/registry/core/configmap/storage"
 	endpointsstore "k8s.io/kubernetes/pkg/registry/core/endpoint/storage"

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

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

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

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

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/controlplane"
 	"k8s.io/kubernetes/test/integration/framework"
 )
 

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

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/controlplane:go_default_library",
-        "//pkg/master/reconcilers: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",

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

test/integration/framework/master_utils.go

@@ -53,10 +53,10 @@ 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/controlplane"
 )
 
 // Config is a struct of configuration directives for NewMasterComponents.

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

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

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

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/features"
 	"k8s.io/kubernetes/pkg/controlplane"
+	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/scheduler"
 	"k8s.io/kubernetes/pkg/scheduler/profile"
 	"k8s.io/kubernetes/test/integration/framework"