github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Part3: master to controlplane in test/integration

Browse Source 
Rename RunAMaster to RunAControlPlane
This commit is contained in:
Mengjiao Liu
2021-05-25 16:10:48 +08:00
parent 2cefcc6be7
commit 387154f1a9
43 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/apiserver/apiserver_test.go
View File

@@ -92,7 +92,7 @@ func setupWithResourcesWithOptions(t *testing.T, opts *framework.MasterConfigOpt
masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig
}
masterConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig()
_, s, closeFn := framework.RunAMaster(masterConfig)
_, s, closeFn := framework.RunAnAPIServer(masterConfig)
clientSet, err := clientset.NewForConfig(&restclient.Config{Host: s.URL, QPS: -1})
if err != nil {
@@ -226,7 +226,7 @@ func Test4xxStatusCodeInvalidPatch(t *testing.T) {
func TestCacheControl(t *testing.T) {
masterConfig := framework.NewIntegrationTestControlPlaneConfigWithOptions(&framework.MasterConfigOptions{})
masterConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig()
master, _, closeFn := framework.RunAMaster(masterConfig)
master, _, closeFn := framework.RunAnAPIServer(masterConfig)
defer closeFn()
rt, err := restclient.TransportFor(master.GenericAPIServer.LoopbackClientConfig)

6
test/integration/apiserver/apply/apply_test.go
View File

@@ -59,7 +59,7 @@ func setup(t testing.TB, groupVersions ...schema.GroupVersion) (*httptest.Server
masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig
}
masterConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig()
_, s, closeFn := framework.RunAMaster(masterConfig)
_, s, closeFn := framework.RunAnAPIServer(masterConfig)
clientSet, err := clientset.NewForConfig(&restclient.Config{Host: s.URL, QPS: -1})
if err != nil {
@@ -2825,7 +2825,7 @@ func TestStopTrackingManagedFieldsOnFeatureDisabled(t *testing.T) {
masterConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, true)()
_, master, closeFn := framework.RunAMaster(masterConfig)
_, master, closeFn := framework.RunAnAPIServer(masterConfig)
client, err := clientset.NewForConfig(&restclient.Config{Host: master.URL, QPS: -1})
if err != nil {
t.Fatalf("Error in create clientset: %v", err)
@@ -2878,7 +2878,7 @@ spec:
// Restart server with server-side apply disabled
closeFn()
defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, genericfeatures.ServerSideApply, false)()
_, master, closeFn = framework.RunAMaster(masterConfig)
_, master, closeFn = framework.RunAnAPIServer(masterConfig)
client, err = clientset.NewForConfig(&restclient.Config{Host: master.URL, QPS: -1})
if err != nil {
t.Fatalf("Error in create clientset: %v", err)

2
test/integration/apiserver/flowcontrol/concurrency_test.go
View File

@@ -62,7 +62,7 @@ func setup(t testing.TB, maxReadonlyRequestsInFlight, MaxMutatingRequestsInFligh
masterConfig.GenericConfig.MaxMutatingRequestsInFlight = MaxMutatingRequestsInFlight
masterConfig.GenericConfig.OpenAPIConfig = framework.DefaultOpenAPIConfig()
masterConfig.ExtraConfig.APIResourceConfigSource = resourceConfig
_, s, closeFn := framework.RunAMaster(masterConfig)
_, s, closeFn := framework.RunAnAPIServer(masterConfig)
return s, masterConfig.GenericConfig.LoopbackClientConfig, closeFn
}

4
test/integration/apiserver/watchcache_test.go
View File

@@ -58,7 +58,7 @@ func multiEtcdSetup(t testing.TB) (clientset.Interface, framework.CloseFunc) {
masterConfig := framework.NewIntegrationTestControlPlaneConfigWithOptions(&opts)
// Switch off endpoints reconciler to avoid unnecessary operations.
masterConfig.ExtraConfig.EndpointReconcilerType = reconcilers.NoneEndpointReconcilerType
_, s, stopMaster := framework.RunAMaster(masterConfig)
_, s, stopMaster := framework.RunAnAPIServer(masterConfig)
closeFn := func() {
stopMaster()
@@ -72,7 +72,7 @@ func multiEtcdSetup(t testing.TB) (clientset.Interface, framework.CloseFunc) {
}
// Wait for apiserver to be stabilized.
// Everything but default service creation is checked in RunAMaster above by
// Everything but default service creation is checked in RunAnAPIServer above by
// waiting for post start hooks, so we just wait for default service to exist.
// TODO(wojtek-t): Figure out less fragile way.
ctx := context.Background()