From 15e0e3e90eb9dfcde0e540a325cee5786eff0cd4 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Wed, 2 Sep 2020 10:47:23 -0700 Subject: [PATCH] rename --- cmd/kube-apiserver/app/aggregator.go | 2 +- cmd/kube-apiserver/app/options/options.go | 2 +- .../app/options/options_test.go | 2 +- cmd/kube-apiserver/app/server.go | 26 +++++++------- pkg/controlplane/controller.go | 2 +- pkg/controlplane/controller_test.go | 2 +- pkg/controlplane/doc.go | 2 +- pkg/controlplane/master.go | 6 ++-- pkg/controlplane/master_test.go | 4 +-- test/integration/apiserver/apiserver_test.go | 4 +-- .../integration/apiserver/apply/apply_test.go | 4 +-- .../apiserver/flowcontrol/concurrency_test.go | 4 +-- test/integration/auth/dynamic_client_test.go | 4 +-- test/integration/auth/rbac_test.go | 6 ++-- test/integration/etcd/server.go | 2 +- test/integration/examples/webhook_test.go | 6 ++-- test/integration/framework/master_utils.go | 34 +++++++++---------- test/integration/framework/test_server.go | 4 +-- .../master/synthetic_master_test.go | 8 ++--- test/integration/openshift/openshift_test.go | 8 ++--- test/integration/volumescheduling/util.go | 4 +-- 21 files changed, 68 insertions(+), 68 deletions(-) diff --git a/cmd/kube-apiserver/app/aggregator.go b/cmd/kube-apiserver/app/aggregator.go index 38595535bed..14af4103ea5 100644 --- a/cmd/kube-apiserver/app/aggregator.go +++ b/cmd/kube-apiserver/app/aggregator.go @@ -50,7 +50,7 @@ import ( informers "k8s.io/kube-aggregator/pkg/client/informers/externalversions/apiregistration/v1" "k8s.io/kube-aggregator/pkg/controllers/autoregister" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" - "k8s.io/kubernetes/pkg/master/controller/crdregistration" + "k8s.io/kubernetes/pkg/controlplane/controller/crdregistration" ) func createAggregatorConfig( diff --git a/cmd/kube-apiserver/app/options/options.go b/cmd/kube-apiserver/app/options/options.go index 0f00095b938..f06ac7e7b4f 100644 --- a/cmd/kube-apiserver/app/options/options.go +++ b/cmd/kube-apiserver/app/options/options.go @@ -33,7 +33,7 @@ import ( kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" "k8s.io/kubernetes/pkg/cluster/ports" - "k8s.io/kubernetes/pkg/master/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" "k8s.io/kubernetes/pkg/serviceaccount" ) diff --git a/cmd/kube-apiserver/app/options/options_test.go b/cmd/kube-apiserver/app/options/options_test.go index 2149c0bed25..8d50c0b313b 100644 --- a/cmd/kube-apiserver/app/options/options_test.go +++ b/cmd/kube-apiserver/app/options/options_test.go @@ -38,7 +38,7 @@ import ( kapi "k8s.io/kubernetes/pkg/apis/core" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/master/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" ) func TestAddFlags(t *testing.T) { diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index 1672cefd927..55d3719e174 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -76,9 +76,9 @@ 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" + "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" ) @@ -225,7 +225,7 @@ func CreateServerChain(completedOptions completedServerRunOptions, stopCh <-chan } // CreateKubeAPIServer creates and wires a workable kube-apiserver -func CreateKubeAPIServer(kubeAPIServerConfig *master.Config, delegateAPIServer genericapiserver.DelegationTarget) (*master.Master, error) { +func CreateKubeAPIServer(kubeAPIServerConfig *controlplane.Config, delegateAPIServer genericapiserver.DelegationTarget) (*controlplane.Master, error) { kubeAPIServer, err := kubeAPIServerConfig.Complete().New(delegateAPIServer) if err != nil { return nil, err @@ -287,7 +287,7 @@ func CreateKubeAPIServerConfig( nodeTunneler tunneler.Tunneler, proxyTransport *http.Transport, ) ( - *master.Config, + *controlplane.Config, *genericapiserver.DeprecatedInsecureServingInfo, aggregatorapiserver.ServiceResolver, []admission.PluginInitializer, @@ -320,7 +320,7 @@ func CreateKubeAPIServerConfig( s.Logs.Apply() - serviceIPRange, apiServerServiceIP, err := master.ServiceIPRange(s.PrimaryServiceClusterIPRange) + serviceIPRange, apiServerServiceIP, err := controlplane.ServiceIPRange(s.PrimaryServiceClusterIPRange) if err != nil { return nil, nil, nil, nil, err } @@ -329,15 +329,15 @@ func CreateKubeAPIServerConfig( var secondaryServiceIPRange net.IPNet // process secondary range only if provided by user if s.SecondaryServiceClusterIPRange.IP != nil { - secondaryServiceIPRange, _, err = master.ServiceIPRange(s.SecondaryServiceClusterIPRange) + secondaryServiceIPRange, _, err = controlplane.ServiceIPRange(s.SecondaryServiceClusterIPRange) if err != nil { return nil, nil, nil, nil, err } } - config := &master.Config{ + config := &controlplane.Config{ GenericConfig: genericConfig, - ExtraConfig: master.ExtraConfig{ + ExtraConfig: controlplane.ExtraConfig{ APIResourceConfigSource: storageFactory.APIResourceConfigSource, StorageFactory: storageFactory, EventTTL: s.EventTTL, @@ -442,7 +442,7 @@ func buildGenericConfig( lastErr error, ) { genericConfig = genericapiserver.NewConfig(legacyscheme.Codecs) - genericConfig.MergedResourceConfig = master.DefaultAPIResourceConfigSource() + genericConfig.MergedResourceConfig = controlplane.DefaultAPIResourceConfigSource() if lastErr = s.GenericServerRunOptions.ApplyTo(genericConfig); lastErr != nil { return @@ -457,7 +457,7 @@ func buildGenericConfig( if lastErr = s.Features.ApplyTo(genericConfig); lastErr != nil { return } - if lastErr = s.APIEnablement.ApplyTo(genericConfig, master.DefaultAPIResourceConfigSource(), legacyscheme.Scheme); lastErr != nil { + if lastErr = s.APIEnablement.ApplyTo(genericConfig, controlplane.DefaultAPIResourceConfigSource(), legacyscheme.Scheme); lastErr != nil { return } if lastErr = s.EgressSelector.ApplyTo(genericConfig); lastErr != nil { @@ -727,7 +727,7 @@ func getServiceIPAndRanges(serviceClusterIPRanges string) (net.IP, net.IPNet, ne // nothing provided by user, use default range (only applies to the Primary) if len(serviceClusterIPRangeList) == 0 { var primaryServiceClusterCIDR net.IPNet - primaryServiceIPRange, apiServerServiceIP, err = master.ServiceIPRange(primaryServiceClusterCIDR) + primaryServiceIPRange, apiServerServiceIP, err = controlplane.ServiceIPRange(primaryServiceClusterCIDR) if err != nil { return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges: %v", err) } @@ -740,7 +740,7 @@ func getServiceIPAndRanges(serviceClusterIPRanges string) (net.IP, net.IPNet, ne return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("service-cluster-ip-range[0] is not a valid cidr") } - primaryServiceIPRange, apiServerServiceIP, err = master.ServiceIPRange(*(primaryServiceClusterCIDR)) + primaryServiceIPRange, apiServerServiceIP, err = controlplane.ServiceIPRange(*(primaryServiceClusterCIDR)) if err != nil { return net.IP{}, net.IPNet{}, net.IPNet{}, fmt.Errorf("error determining service IP ranges for primary service cidr: %v", err) } diff --git a/pkg/controlplane/controller.go b/pkg/controlplane/controller.go index 26336f1a2fc..faa11983e10 100644 --- a/pkg/controlplane/controller.go +++ b/pkg/controlplane/controller.go @@ -34,7 +34,7 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/rest" "k8s.io/klog/v2" - "k8s.io/kubernetes/pkg/master/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" "k8s.io/kubernetes/pkg/registry/core/rangeallocation" corerest "k8s.io/kubernetes/pkg/registry/core/rest" servicecontroller "k8s.io/kubernetes/pkg/registry/core/service/ipallocator/controller" diff --git a/pkg/controlplane/controller_test.go b/pkg/controlplane/controller_test.go index eb907227e0b..8b68e958000 100644 --- a/pkg/controlplane/controller_test.go +++ b/pkg/controlplane/controller_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/kubernetes/fake" core "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/master/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" ) func TestReconcileEndpoints(t *testing.T) { diff --git a/pkg/controlplane/doc.go b/pkg/controlplane/doc.go index 4b1c565bf3c..c8ef7113920 100644 --- a/pkg/controlplane/doc.go +++ b/pkg/controlplane/doc.go @@ -16,4 +16,4 @@ limitations under the License. // Package master contains code for setting up and running a Kubernetes // cluster master. -package controlplane // import "k8s.io/kubernetes/pkg/master" +package controlplane // import "k8s.io/kubernetes/pkg/controlplane" diff --git a/pkg/controlplane/master.go b/pkg/controlplane/master.go index bb0d4de7111..984d5543c3c 100644 --- a/pkg/controlplane/master.go +++ b/pkg/controlplane/master.go @@ -82,9 +82,9 @@ import ( "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/controlplane/controller/clusterauthenticationtrust" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/tunneler" "k8s.io/kubernetes/pkg/routes" "k8s.io/kubernetes/pkg/serviceaccount" nodeutil "k8s.io/kubernetes/pkg/util/node" diff --git a/pkg/controlplane/master_test.go b/pkg/controlplane/master_test.go index fc0f15af945..780afb07f71 100644 --- a/pkg/controlplane/master_test.go +++ b/pkg/controlplane/master_test.go @@ -52,8 +52,8 @@ import ( "k8s.io/kubernetes/pkg/apis/networking" apisstorage "k8s.io/kubernetes/pkg/apis/storage" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/master/reconcilers" - "k8s.io/kubernetes/pkg/master/storageversionhashdata" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" + "k8s.io/kubernetes/pkg/controlplane/storageversionhashdata" certificatesrest "k8s.io/kubernetes/pkg/registry/certificates/rest" corerest "k8s.io/kubernetes/pkg/registry/core/rest" "k8s.io/kubernetes/pkg/registry/registrytest" diff --git a/test/integration/apiserver/apiserver_test.go b/test/integration/apiserver/apiserver_test.go index c93dd323e26..2de3f17e22b 100644 --- a/test/integration/apiserver/apiserver_test.go +++ b/test/integration/apiserver/apiserver_test.go @@ -62,7 +62,7 @@ import ( featuregatetesting "k8s.io/component-base/featuregate/testing" "k8s.io/klog/v2" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration" "k8s.io/kubernetes/test/integration/framework" ) @@ -82,7 +82,7 @@ func setupWithResources(t *testing.T, groupVersions []schema.GroupVersion, resou func setupWithResourcesWithOptions(t *testing.T, opts *framework.MasterConfigOptions, groupVersions []schema.GroupVersion, resources []schema.GroupVersionResource) (*httptest.Server, clientset.Interface, framework.CloseFunc) { masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(opts) if len(groupVersions) > 0 || len(resources) > 0 { - resourceConfig := master.DefaultAPIResourceConfigSource() + resourceConfig := controlplane.DefaultAPIResourceConfigSource() resourceConfig.EnableVersions(groupVersions...) resourceConfig.EnableResources(resources...) masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig diff --git a/test/integration/apiserver/apply/apply_test.go b/test/integration/apiserver/apply/apply_test.go index f86b87d7944..a6e3d1fdffc 100644 --- a/test/integration/apiserver/apply/apply_test.go +++ b/test/integration/apiserver/apply/apply_test.go @@ -45,7 +45,7 @@ import ( clientset "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" featuregatetesting "k8s.io/component-base/featuregate/testing" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration/framework" ) @@ -54,7 +54,7 @@ func setup(t testing.TB, groupVersions ...schema.GroupVersion) (*httptest.Server opts.EtcdOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf" masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(&opts) if len(groupVersions) > 0 { - resourceConfig := master.DefaultAPIResourceConfigSource() + resourceConfig := controlplane.DefaultAPIResourceConfigSource() resourceConfig.EnableVersions(groupVersions...) masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig } diff --git a/test/integration/apiserver/flowcontrol/concurrency_test.go b/test/integration/apiserver/flowcontrol/concurrency_test.go index bb30315a32f..0e1d440ea3e 100644 --- a/test/integration/apiserver/flowcontrol/concurrency_test.go +++ b/test/integration/apiserver/flowcontrol/concurrency_test.go @@ -37,7 +37,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" featuregatetesting "k8s.io/component-base/featuregate/testing" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration/framework" ) @@ -53,7 +53,7 @@ func setup(t testing.TB) (*httptest.Server, *rest.Config, framework.CloseFunc) { opts := framework.MasterConfigOptions{EtcdOptions: framework.DefaultEtcdOptions()} opts.EtcdOptions.DefaultStorageMediaType = "application/vnd.kubernetes.protobuf" masterConfig := framework.NewIntegrationTestMasterConfigWithOptions(&opts) - resourceConfig := master.DefaultAPIResourceConfigSource() + resourceConfig := controlplane.DefaultAPIResourceConfigSource() resourceConfig.EnableVersions(schema.GroupVersion{ Group: "flowcontrol.apiserver.k8s.io", Version: "v1alpha1", diff --git a/test/integration/auth/dynamic_client_test.go b/test/integration/auth/dynamic_client_test.go index 6797260a26d..e12fc589fc4 100644 --- a/test/integration/auth/dynamic_client_test.go +++ b/test/integration/auth/dynamic_client_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/features" kubeoptions "k8s.io/kubernetes/pkg/kubeapiserver/options" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration/framework" ) @@ -77,7 +77,7 @@ func TestDynamicClientBuilder(t *testing.T) { opts.Authentication.ServiceAccounts.Issuer = iss opts.Authentication.ServiceAccounts.KeyFiles = []string{tmpfile.Name()} }, - ModifyServerConfig: func(config *master.Config) { + ModifyServerConfig: func(config *controlplane.Config) { config.GenericConfig.Authorization.Authorizer = authorizerfactory.NewAlwaysAllowAuthorizer() }, }) diff --git a/test/integration/auth/rbac_test.go b/test/integration/auth/rbac_test.go index 6704903f0d9..0286537ac22 100644 --- a/test/integration/auth/rbac_test.go +++ b/test/integration/auth/rbac_test.go @@ -49,7 +49,7 @@ import ( "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/api/legacyscheme" rbachelper "k8s.io/kubernetes/pkg/apis/rbac/v1" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" clusterrolestore "k8s.io/kubernetes/pkg/registry/rbac/clusterrole/storage" "k8s.io/kubernetes/pkg/registry/rbac/clusterrolebinding" @@ -78,7 +78,7 @@ func clientsetForToken(user string, config *restclient.Config) (clientset.Interf } type testRESTOptionsGetter struct { - config *master.Config + config *controlplane.Config } func (getter *testRESTOptionsGetter) GetRESTOptions(resource schema.GroupResource) (generic.RESTOptions, error) { @@ -89,7 +89,7 @@ func (getter *testRESTOptionsGetter) GetRESTOptions(resource schema.GroupResourc return generic.RESTOptions{StorageConfig: storageConfig, Decorator: generic.UndecoratedStorage, ResourcePrefix: resource.Resource}, nil } -func newRBACAuthorizer(t *testing.T, config *master.Config) authorizer.Authorizer { +func newRBACAuthorizer(t *testing.T, config *controlplane.Config) authorizer.Authorizer { optsGetter := &testRESTOptionsGetter{config} roleRest, err := rolestore.NewREST(optsGetter) if err != nil { diff --git a/test/integration/etcd/server.go b/test/integration/etcd/server.go index 8ef6645aabf..783a33c50bc 100644 --- a/test/integration/etcd/server.go +++ b/test/integration/etcd/server.go @@ -50,7 +50,7 @@ import ( "k8s.io/kubernetes/test/integration/framework" // install all APIs - _ "k8s.io/kubernetes/pkg/master" + _ "k8s.io/kubernetes/pkg/controlplane" ) // StartRealMasterOrDie starts an API master that is appropriate for use in tests that require one of every resource diff --git a/test/integration/examples/webhook_test.go b/test/integration/examples/webhook_test.go index e81f7c5e181..cbf60fc5ac0 100644 --- a/test/integration/examples/webhook_test.go +++ b/test/integration/examples/webhook_test.go @@ -29,8 +29,8 @@ import ( auditinternal "k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" - "k8s.io/kubernetes/pkg/master" - "k8s.io/kubernetes/pkg/master/reconcilers" + "k8s.io/kubernetes/pkg/controlplane" + "k8s.io/kubernetes/pkg/controlplane/reconcilers" "k8s.io/kubernetes/test/integration/framework" ) @@ -45,7 +45,7 @@ func TestWebhookLoopback(t *testing.T) { client, _ := framework.StartTestServer(t, stopCh, framework.TestServerSetup{ ModifyServerRunOptions: func(opts *options.ServerRunOptions) { }, - ModifyServerConfig: func(config *master.Config) { + ModifyServerConfig: func(config *controlplane.Config) { // Avoid resolveable kubernetes service config.ExtraConfig.EndpointReconcilerType = reconcilers.NoneEndpointReconcilerType diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 444d7b06fea..bfaffa83f76 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -56,13 +56,13 @@ import ( "k8s.io/kubernetes/pkg/generated/openapi" "k8s.io/kubernetes/pkg/kubeapiserver" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" ) // Config is a struct of configuration directives for NewMasterComponents. type Config struct { // If nil, a default is used, partially filled configs will not get populated. - MasterConfig *master.Config + MasterConfig *controlplane.Config StartReplicationManager bool // Client throttling qps QPS float32 @@ -89,17 +89,17 @@ func alwaysEmpty(req *http.Request) (*authauthenticator.Response, bool, error) { // MasterReceiver can be used to provide the master to a custom incoming server function type MasterReceiver interface { - SetMaster(m *master.Master) + SetMaster(m *controlplane.Master) } // MasterHolder implements type MasterHolder struct { Initialized chan struct{} - M *master.Master + M *controlplane.Master } // SetMaster assigns the current master. -func (h *MasterHolder) SetMaster(m *master.Master) { +func (h *MasterHolder) SetMaster(m *controlplane.Master) { h.M = m close(h.Initialized) } @@ -124,8 +124,8 @@ func DefaultOpenAPIConfig() *openapicommon.Config { } // startMasterOrDie starts a kubernetes master and an httpserver to handle api requests -func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Server, masterReceiver MasterReceiver) (*master.Master, *httptest.Server, CloseFunc) { - var m *master.Master +func startMasterOrDie(masterConfig *controlplane.Config, incomingServer *httptest.Server, masterReceiver MasterReceiver) (*controlplane.Master, *httptest.Server, CloseFunc) { + var m *controlplane.Master var s *httptest.Server // Ensure we log at least level 4 @@ -249,16 +249,16 @@ func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Serv } // NewIntegrationTestMasterConfig returns the master config appropriate for most integration tests. -func NewIntegrationTestMasterConfig() *master.Config { +func NewIntegrationTestMasterConfig() *controlplane.Config { return NewIntegrationTestMasterConfigWithOptions(&MasterConfigOptions{}) } // NewIntegrationTestMasterConfigWithOptions returns the master config appropriate for most integration tests // configured with the provided options. -func NewIntegrationTestMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config { +func NewIntegrationTestMasterConfigWithOptions(opts *MasterConfigOptions) *controlplane.Config { masterConfig := NewMasterConfigWithOptions(opts) masterConfig.GenericConfig.PublicAddress = net.ParseIP("192.168.10.4") - masterConfig.ExtraConfig.APIResourceConfigSource = master.DefaultAPIResourceConfigSource() + masterConfig.ExtraConfig.APIResourceConfigSource = controlplane.DefaultAPIResourceConfigSource() // TODO: get rid of these tests or port them to secure serving masterConfig.GenericConfig.SecureServing = &genericapiserver.SecureServingInfo{Listener: fakeLocalhost443Listener{}} @@ -282,12 +282,12 @@ func DefaultEtcdOptions() *options.EtcdOptions { } // NewMasterConfig returns a basic master config. -func NewMasterConfig() *master.Config { +func NewMasterConfig() *controlplane.Config { return NewMasterConfigWithOptions(&MasterConfigOptions{}) } // NewMasterConfigWithOptions returns a basic master config configured with the provided options. -func NewMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config { +func NewMasterConfigWithOptions(opts *MasterConfigOptions) *controlplane.Config { etcdOptions := DefaultEtcdOptions() if opts.EtcdOptions != nil { etcdOptions = opts.EtcdOptions @@ -317,10 +317,10 @@ func NewMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config { panic(err) } - return &master.Config{ + return &controlplane.Config{ GenericConfig: genericConfig, - ExtraConfig: master.ExtraConfig{ - APIResourceConfigSource: master.DefaultAPIResourceConfigSource(), + ExtraConfig: controlplane.ExtraConfig{ + APIResourceConfigSource: controlplane.DefaultAPIResourceConfigSource(), StorageFactory: storageFactory, KubeletClientConfig: kubeletclient.KubeletClientConfig{Port: 10250}, APIServerServicePort: 443, @@ -333,7 +333,7 @@ func NewMasterConfigWithOptions(opts *MasterConfigOptions) *master.Config { type CloseFunc func() // RunAMaster starts a master with the provided config. -func RunAMaster(masterConfig *master.Config) (*master.Master, *httptest.Server, CloseFunc) { +func RunAMaster(masterConfig *controlplane.Config) (*controlplane.Master, *httptest.Server, CloseFunc) { if masterConfig == nil { masterConfig = NewMasterConfig() masterConfig.GenericConfig.EnableProfiling = true @@ -342,7 +342,7 @@ func RunAMaster(masterConfig *master.Config) (*master.Master, *httptest.Server, } // RunAMasterUsingServer starts up a master using the provided config on the specified server. -func RunAMasterUsingServer(masterConfig *master.Config, s *httptest.Server, masterReceiver MasterReceiver) (*master.Master, *httptest.Server, CloseFunc) { +func RunAMasterUsingServer(masterConfig *controlplane.Config, s *httptest.Server, masterReceiver MasterReceiver) (*controlplane.Master, *httptest.Server, CloseFunc) { return startMasterOrDie(masterConfig, s, masterReceiver) } diff --git a/test/integration/framework/test_server.go b/test/integration/framework/test_server.go index 5dea71572fc..6e975610738 100644 --- a/test/integration/framework/test_server.go +++ b/test/integration/framework/test_server.go @@ -37,14 +37,14 @@ import ( "k8s.io/client-go/util/cert" "k8s.io/kubernetes/cmd/kube-apiserver/app" "k8s.io/kubernetes/cmd/kube-apiserver/app/options" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/utils" ) // TestServerSetup holds configuration information for a kube-apiserver test server. type TestServerSetup struct { ModifyServerRunOptions func(*options.ServerRunOptions) - ModifyServerConfig func(*master.Config) + ModifyServerConfig func(*controlplane.Config) } // StartTestServer runs a kube-apiserver, optionally calling out to the setup.ModifyServerRunOptions and setup.ModifyServerConfig functions diff --git a/test/integration/master/synthetic_master_test.go b/test/integration/master/synthetic_master_test.go index 2c29cfb59cd..ed15481c702 100644 --- a/test/integration/master/synthetic_master_test.go +++ b/test/integration/master/synthetic_master_test.go @@ -48,7 +48,7 @@ import ( clientset "k8s.io/client-go/kubernetes" clienttypedv1 "k8s.io/client-go/kubernetes/typed/core/v1" restclient "k8s.io/client-go/rest" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/test/integration" "k8s.io/kubernetes/test/integration/framework" ) @@ -143,13 +143,13 @@ func TestEmptyList(t *testing.T) { } } -func initStatusForbiddenMasterCongfig() *master.Config { +func initStatusForbiddenMasterCongfig() *controlplane.Config { masterConfig := framework.NewIntegrationTestMasterConfig() masterConfig.GenericConfig.Authorization.Authorizer = authorizerfactory.NewAlwaysDenyAuthorizer() return masterConfig } -func initUnauthorizedMasterCongfig() *master.Config { +func initUnauthorizedMasterCongfig() *controlplane.Config { masterConfig := framework.NewIntegrationTestMasterConfig() tokenAuthenticator := tokentest.New() tokenAuthenticator.Tokens[AliceToken] = &user.DefaultInfo{Name: "alice", UID: "1"} @@ -162,7 +162,7 @@ func initUnauthorizedMasterCongfig() *master.Config { func TestStatus(t *testing.T) { testCases := []struct { name string - masterConfig *master.Config + masterConfig *controlplane.Config statusCode int reqPath string reason string diff --git a/test/integration/openshift/openshift_test.go b/test/integration/openshift/openshift_test.go index 2bbb7fd50ea..830769d5226 100644 --- a/test/integration/openshift/openshift_test.go +++ b/test/integration/openshift/openshift_test.go @@ -20,21 +20,21 @@ import ( "testing" genericapiserver "k8s.io/apiserver/pkg/server" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" ) // This test references methods that OpenShift uses to customize the master on startup, that // are not referenced directly by a master. func TestMasterExportsSymbols(t *testing.T) { - _ = &master.Config{ + _ = &controlplane.Config{ GenericConfig: &genericapiserver.Config{ EnableMetrics: true, }, - ExtraConfig: master.ExtraConfig{ + ExtraConfig: controlplane.ExtraConfig{ EnableLogsSupport: false, }, } - _ = &master.Master{ + _ = &controlplane.Master{ GenericAPIServer: &genericapiserver.GenericAPIServer{}, } } diff --git a/test/integration/volumescheduling/util.go b/test/integration/volumescheduling/util.go index 7c5cf94a207..54f96617663 100644 --- a/test/integration/volumescheduling/util.go +++ b/test/integration/volumescheduling/util.go @@ -36,7 +36,7 @@ import ( "k8s.io/client-go/tools/events" podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/features" - "k8s.io/kubernetes/pkg/master" + "k8s.io/kubernetes/pkg/controlplane" "k8s.io/kubernetes/pkg/scheduler" "k8s.io/kubernetes/pkg/scheduler/profile" "k8s.io/kubernetes/test/integration/framework" @@ -72,7 +72,7 @@ func initTestMaster(t *testing.T, nsPrefix string, admission admission.Interface })) masterConfig := framework.NewIntegrationTestMasterConfig() - resourceConfig := master.DefaultAPIResourceConfigSource() + resourceConfig := controlplane.DefaultAPIResourceConfigSource() if utilfeature.DefaultFeatureGate.Enabled(features.CSIStorageCapacity) { resourceConfig.EnableVersions(schema.GroupVersion{ Group: "storage.k8s.io",