Skip to content

Commit 0455c2d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#94407 from lavalamp/big-rename
Control Plane is a better name
2 parents 09851c0 + 9eb664f commit 0455c2d

File tree

103 files changed

+158
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+158
-158
lines changed

‎cmd/cloud-controller-manager/.import-restrictions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ rules:
7979
- k8s.io/kubernetes/pkg/features
8080
- k8s.io/kubernetes/pkg/fieldpath
8181
- k8s.io/kubernetes/pkg/kubelet/types
82-
- k8s.io/kubernetes/pkg/master/ports
82+
- k8s.io/kubernetes/pkg/cluster/ports
8383
- k8s.io/kubernetes/pkg/security/apparmor
8484
- k8s.io/kubernetes/pkg/securitycontext
8585
- k8s.io/kubernetes/pkg/serviceaccount

‎cmd/kube-apiserver/app/BUILD‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ go_library(
1313
"//cmd/kube-apiserver/app/options:go_default_library",
1414
"//pkg/api/legacyscheme:go_default_library",
1515
"//pkg/capabilities:go_default_library",
16+
"//pkg/controlplane:go_default_library",
17+
"//pkg/controlplane/controller/crdregistration:go_default_library",
18+
"//pkg/controlplane/reconcilers:go_default_library",
19+
"//pkg/controlplane/tunneler:go_default_library",
1620
"//pkg/features:go_default_library",
1721
"//pkg/generated/openapi:go_default_library",
1822
"//pkg/kubeapiserver:go_default_library",
@@ -21,10 +25,6 @@ go_library(
2125
"//pkg/kubeapiserver/authorizer/modes:go_default_library",
2226
"//pkg/kubeapiserver/options:go_default_library",
2327
"//pkg/kubeapiserver/server:go_default_library",
24-
"//pkg/master:go_default_library",
25-
"//pkg/master/controller/crdregistration:go_default_library",
26-
"//pkg/master/reconcilers:go_default_library",
27-
"//pkg/master/tunneler:go_default_library",
2828
"//pkg/registry/rbac/rest:go_default_library",
2929
"//pkg/serviceaccount:go_default_library",
3030
"//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1:go_default_library",

‎cmd/kube-apiserver/app/aggregator.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import (
5050
informers "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1"
5151
"k8s.io/kube-aggregator/pkg/controllers/autoregister"
5252
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
53-
"k8s.io/kubernetes/pkg/master/controller/crdregistration"
53+
"k8s.io/kubernetes/pkg/controlplane/controller/crdregistration"
5454
)
5555

5656
func createAggregatorConfig(

‎cmd/kube-apiserver/app/options/BUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ go_library(
1919
"//pkg/api/legacyscheme:go_default_library",
2020
"//pkg/apis/core:go_default_library",
2121
"//pkg/cloudprovider/providers:go_default_library",
22+
"//pkg/cluster/ports:go_default_library",
23+
"//pkg/controlplane/reconcilers:go_default_library",
2224
"//pkg/features:go_default_library",
2325
"//pkg/kubeapiserver/options:go_default_library",
2426
"//pkg/kubelet/client:go_default_library",
25-
"//pkg/master/ports:go_default_library",
26-
"//pkg/master/reconcilers:go_default_library",
2727
"//pkg/serviceaccount:go_default_library",
2828
"//staging/src/k8s.io/apiextensions-apiserver/pkg/apiserver:go_default_library",
2929
"//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library",
@@ -52,10 +52,10 @@ go_test(
5252
embed = [":go_default_library"],
5353
deps = [
5454
"//pkg/apis/core:go_default_library",
55+
"//pkg/controlplane/reconcilers:go_default_library",
5556
"//pkg/features:go_default_library",
5657
"//pkg/kubeapiserver/options:go_default_library",
5758
"//pkg/kubelet/client:go_default_library",
58-
"//pkg/master/reconcilers:go_default_library",
5959
"//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
6060
"//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",
6161
"//staging/src/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library",

‎cmd/kube-apiserver/app/options/options.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ import (
2929
"k8s.io/component-base/logs"
3030
"k8s.io/component-base/metrics"
3131
api "k8s.io/kubernetes/pkg/apis/core"
32+
"k8s.io/kubernetes/pkg/cluster/ports"
33+
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
3234
_ "k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates
3335
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
3436
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
35-
"k8s.io/kubernetes/pkg/master/ports"
36-
"k8s.io/kubernetes/pkg/master/reconcilers"
3737
"k8s.io/kubernetes/pkg/serviceaccount"
3838
)
3939

‎cmd/kube-apiserver/app/options/options_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ import (
3636
cliflag "k8s.io/component-base/cli/flag"
3737
"k8s.io/component-base/metrics"
3838
kapi "k8s.io/kubernetes/pkg/apis/core"
39+
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
3940
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
4041
kubeletclient "k8s.io/kubernetes/pkg/kubelet/client"
41-
"k8s.io/kubernetes/pkg/master/reconcilers"
4242
)
4343

4444
func TestAddFlags(t *testing.T) {

‎cmd/kube-apiserver/app/server.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ import (
6868
"k8s.io/kubernetes/cmd/kube-apiserver/app/options"
6969
"k8s.io/kubernetes/pkg/api/legacyscheme"
7070
"k8s.io/kubernetes/pkg/capabilities"
71+
"k8s.io/kubernetes/pkg/controlplane"
72+
"k8s.io/kubernetes/pkg/controlplane/reconcilers"
73+
"k8s.io/kubernetes/pkg/controlplane/tunneler"
7174
"k8s.io/kubernetes/pkg/features"
7275
generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi"
7376
"k8s.io/kubernetes/pkg/kubeapiserver"
@@ -76,9 +79,6 @@ import (
7679
"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"
7780
kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options"
7881
kubeserver "k8s.io/kubernetes/pkg/kubeapiserver/server"
79-
"k8s.io/kubernetes/pkg/master"
80-
"k8s.io/kubernetes/pkg/master/reconcilers"
81-
"k8s.io/kubernetes/pkg/master/tunneler"
8282
rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest"
8383
"k8s.io/kubernetes/pkg/serviceaccount"
8484
)
@@ -225,7 +225,7 @@ func CreateServerChain(completedOptions completedServerRunOptions, stopCh <-chan
225225
}
226226

227227
// CreateKubeAPIServer creates and wires a workable kube-apiserver
228-
func CreateKubeAPIServer(kubeAPIServerConfig *master.Config, delegateAPIServer genericapiserver.DelegationTarget) (*master.Master, error) {
228+
func CreateKubeAPIServer(kubeAPIServerConfig *controlplane.Config, delegateAPIServer genericapiserver.DelegationTarget) (*controlplane.Master, error) {
229229
kubeAPIServer, err := kubeAPIServerConfig.Complete().New(delegateAPIServer)
230230
if err != nil {
231231
return nil, err
@@ -287,7 +287,7 @@ func CreateKubeAPIServerConfig(
287287
nodeTunneler tunneler.Tunneler,
288288
proxyTransport *http.Transport,
289289
) (
290-
*master.Config,
290+
*controlplane.Config,
291291
*genericapiserver.DeprecatedInsecureServingInfo,
292292
aggregatorapiserver.ServiceResolver,
293293
[]admission.PluginInitializer,
@@ -320,7 +320,7 @@ func CreateKubeAPIServerConfig(
320320

321321
s.Logs.Apply()
322322

323-
serviceIPRange, apiServerServiceIP, err := master.ServiceIPRange(s.PrimaryServiceClusterIPRange)
323+
serviceIPRange, apiServerServiceIP, err := controlplane.ServiceIPRange(s.PrimaryServiceClusterIPRange)
324324
if err != nil {
325325
return nil, nil, nil, nil, err
326326
}
@@ -329,15 +329,15 @@ func CreateKubeAPIServerConfig(
329329
var secondaryServiceIPRange net.IPNet
330330
// process secondary range only if provided by user
331331
if s.SecondaryServiceClusterIPRange.IP != nil {
332-
secondaryServiceIPRange, _, err = master.ServiceIPRange(s.SecondaryServiceClusterIPRange)
332+
secondaryServiceIPRange, _, err = controlplane.ServiceIPRange(s.SecondaryServiceClusterIPRange)
333333
if err != nil {
334334
return nil, nil, nil, nil, err
335335
}
336336
}
337337

338-
config := &master.Config{
338+
config := &controlplane.Config{
339339
GenericConfig: genericConfig,
340-
ExtraConfig: master.ExtraConfig{
340+
ExtraConfig: controlplane.ExtraConfig{
341341
APIResourceConfigSource: storageFactory.APIResourceConfigSource,
342342
StorageFactory: storageFactory,
343343
EventTTL: s.EventTTL,
@@ -442,7 +442,7 @@ func buildGenericConfig(
442442
lastErr error,
443443
) {
444444
genericConfig = genericapiserver.NewConfig(legacyscheme.Codecs)
445-
genericConfig.MergedResourceConfig = master.DefaultAPIResourceConfigSource()
445+
genericConfig.MergedResourceConfig = controlplane.DefaultAPIResourceConfigSource()
446446

447447
if lastErr = s.GenericServerRunOptions.ApplyTo(genericConfig); lastErr != nil {
448448
return
@@ -457,7 +457,7 @@ func buildGenericConfig(
457457
if lastErr = s.Features.ApplyTo(genericConfig); lastErr != nil {
458458
return
459459
}
460-
if lastErr = s.APIEnablement.ApplyTo(genericConfig, master.DefaultAPIResourceConfigSource(), legacyscheme.Scheme); lastErr != nil {
460+
if lastErr = s.APIEnablement.ApplyTo(genericConfig, controlplane.DefaultAPIResourceConfigSource(), legacyscheme.Scheme); lastErr != nil {
461461
return
462462
}
463463
if lastErr = s.EgressSelector.ApplyTo(genericConfig); lastErr != nil {
@@ -727,7 +727,7 @@ func getServiceIPAndRanges(serviceClusterIPRanges string) (net.IP, net.IPNet, ne
727727
// nothing provided by user, use default range (only applies to the Primary)
728728
if len(serviceClusterIPRangeList) == 0 {
729729
var primaryServiceClusterCIDR net.IPNet
730-
primaryServiceIPRange, apiServerServiceIP, err = master.ServiceIPRange(primaryServiceClusterCIDR)
730+
primaryServiceIPRange, apiServerServiceIP, err = controlplane.ServiceIPRange(primaryServiceClusterCIDR)
731731
if err != nil {
732732
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges: %v", err)
733733
}
@@ -740,7 +740,7 @@ func getServiceIPAndRanges(serviceClusterIPRanges string) (net.IP, net.IPNet, ne
740740
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("service-cluster-ip-range[0] is not a valid cidr")
741741
}
742742

743-
primaryServiceIPRange, apiServerServiceIP, err = master.ServiceIPRange(*(primaryServiceClusterCIDR))
743+
primaryServiceIPRange, apiServerServiceIP, err = controlplane.ServiceIPRange(*(primaryServiceClusterCIDR))
744744
if err != nil {
745745
return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges for primary service cidr: %v", err)
746746
}

‎cmd/kube-controller-manager/app/options/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ go_library(
3737
deps = [
3838
"//cmd/controller-manager/app/options:go_default_library",
3939
"//cmd/kube-controller-manager/app/config:go_default_library",
40+
"//pkg/cluster/ports:go_default_library",
4041
"//pkg/controller/apis/config:go_default_library",
4142
"//pkg/controller/apis/config/scheme:go_default_library",
4243
"//pkg/controller/certificates/signer/config:go_default_library",
@@ -62,7 +63,6 @@ go_library(
6263
"//pkg/controller/volume/attachdetach/config:go_default_library",
6364
"//pkg/controller/volume/persistentvolume/config:go_default_library",
6465
"//pkg/features:go_default_library",
65-
"//pkg/master/ports:go_default_library",
6666
"//staging/src/k8s.io/api/core/v1:go_default_library",
6767
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
6868
"//staging/src/k8s.io/apiserver/pkg/server/options:go_default_library",

‎cmd/kube-controller-manager/app/options/options.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ import (
3838
kubectrlmgrconfigv1alpha1 "k8s.io/kube-controller-manager/config/v1alpha1"
3939
cmoptions "k8s.io/kubernetes/cmd/controller-manager/app/options"
4040
kubecontrollerconfig "k8s.io/kubernetes/cmd/kube-controller-manager/app/config"
41+
"k8s.io/kubernetes/pkg/cluster/ports"
4142
kubectrlmgrconfig "k8s.io/kubernetes/pkg/controller/apis/config"
4243
kubectrlmgrconfigscheme "k8s.io/kubernetes/pkg/controller/apis/config/scheme"
4344
"k8s.io/kubernetes/pkg/controller/garbagecollector"
4445
garbagecollectorconfig "k8s.io/kubernetes/pkg/controller/garbagecollector/config"
45-
"k8s.io/kubernetes/pkg/master/ports"
4646

4747
// add the kubernetes feature gates
4848
_ "k8s.io/kubernetes/pkg/features"

‎cmd/kube-proxy/app/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ go_library(
1919
importpath = "k8s.io/kubernetes/cmd/kube-proxy/app",
2020
deps = [
2121
"//pkg/apis/core:go_default_library",
22+
"//pkg/cluster/ports:go_default_library",
2223
"//pkg/features:go_default_library",
2324
"//pkg/kubelet/qos:go_default_library",
24-
"//pkg/master/ports:go_default_library",
2525
"//pkg/proxy:go_default_library",
2626
"//pkg/proxy/apis:go_default_library",
2727
"//pkg/proxy/apis/config:go_default_library",

0 commit comments

Comments
 (0)