github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-08 03:33:56 +00:00
Code Issues Projects Releases Wiki Activity

test/integration: Rename master to controlplane or apiserver

Browse Source
This commit is contained in:
Mengjiao Liu 2021-06-08 17:26:57 +08:00
parent 257b494478
commit 0fcd3c951c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/integration/framework/master_utils.go
View File

@ -123,7 +123,7 @@ func DefaultOpenAPIConfig() *openapicommon.Config {
return openAPIConfig return openAPIConfig
} }
// startAPIServerOrDie starts a kubernetes master and an httpserver to handle api requests // startAPIServerOrDie starts a kubernetes API server and an httpserver to handle api requests
func startAPIServerOrDie(controlPlaneConfig *controlplane.Config, incomingServer *httptest.Server, apiServerReceiver APIServerReceiver) (*controlplane.Instance, *httptest.Server, CloseFunc) { func startAPIServerOrDie(controlPlaneConfig *controlplane.Config, incomingServer *httptest.Server, apiServerReceiver APIServerReceiver) (*controlplane.Instance, *httptest.Server, CloseFunc) {
var m *controlplane.Instance var m *controlplane.Instance
var s *httptest.Server var s *httptest.Server
@ -210,9 +210,9 @@ func startAPIServerOrDie(controlPlaneConfig *controlplane.Config, incomingServer
m, err = controlPlaneConfig.Complete().New(genericapiserver.NewEmptyDelegate()) m, err = controlPlaneConfig.Complete().New(genericapiserver.NewEmptyDelegate())
if err != nil { if err != nil {
// We log the error first so that even if closeFn crashes, the error is shown // We log the error first so that even if closeFn crashes, the error is shown
klog.Errorf("error in bringing up the master: %v", err) klog.Errorf("error in bringing up the apiserver: %v", err)
closeFn() closeFn()
klog.Fatalf("error in bringing up the master: %v", err) klog.Fatalf("error in bringing up the apiserver: %v", err)
} }
if apiServerReceiver != nil { if apiServerReceiver != nil {
apiServerReceiver.SetAPIServer(m) apiServerReceiver.SetAPIServer(m)
@ -251,7 +251,7 @@ func startAPIServerOrDie(controlPlaneConfig *controlplane.Config, incomingServer
return m, s, closeFn return m, s, closeFn
} }
// NewIntegrationTestControlPlaneConfig returns the master config appropriate for most integration tests. // NewIntegrationTestControlPlaneConfig returns the control plane config appropriate for most integration tests.
func NewIntegrationTestControlPlaneConfig() *controlplane.Config { func NewIntegrationTestControlPlaneConfig() *controlplane.Config {
return NewIntegrationTestControlPlaneConfigWithOptions(&ControlPlaneConfigOptions{}) return NewIntegrationTestControlPlaneConfigWithOptions(&ControlPlaneConfigOptions{})
} }
@ -269,7 +269,7 @@ func NewIntegrationTestControlPlaneConfigWithOptions(opts *ControlPlaneConfigOpt
return controlPlaneConfig return controlPlaneConfig
} }
// ControlPlaneConfigOptions are the configurable options for a new integration test master config. // ControlPlaneConfigOptions are the configurable options for a new integration test control plane config.
type ControlPlaneConfigOptions struct { type ControlPlaneConfigOptions struct {
EtcdOptions *options.EtcdOptions EtcdOptions *options.EtcdOptions
} }
@ -338,7 +338,7 @@ func NewControlPlaneConfigWithOptions(opts *ControlPlaneConfigOptions) *controlp
} }
} }
// CloseFunc can be called to cleanup the master // CloseFunc can be called to cleanup the API server
type CloseFunc func() type CloseFunc func()
// RunAnAPIServer starts a API server with the provided config. // RunAnAPIServer starts a API server with the provided config.