Unify genericapiserver Config.New() and master Config.New()

cmd/kube-apiserver/app/server.go

@@ -330,7 +330,7 @@ func Run(s *options.APIServer) error {
 		cachesize.SetWatchCacheSizes(s.WatchCacheSizes)
 	}
 
-	m, err := master.New(config)
+	m, err := config.New()
 	if err != nil {
 		return err
 	}

pkg/master/master.go

@@ -194,7 +194,7 @@ type RESTStorageProvider interface {
 // Certain config fields will be set to a default value if unset.
 // Certain config fields must be specified, including:
 //   KubeletClient
-func New(c *Config) (*Master, error) {
+func (c *Config) New() (*Master, error) {
 	if c.KubeletClient == nil {
 		return nil, fmt.Errorf("Master.New() called with config.KubeletClient == nil")
 	}

pkg/master/master_test.go

@@ -125,7 +125,7 @@ func setUp(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert.
 func newMaster(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert.Assertions) {
 	_, etcdserver, config, assert := setUp(t)
 
-	master, err := New(&config)
+	master, err := config.New()
 	if err != nil {
 		t.Fatalf("Error in bringing up the master: %v", err)
 	}
@@ -151,7 +151,7 @@ func limitedAPIResourceConfigSource() *genericapiserver.ResourceConfig {
 func newLimitedMaster(t *testing.T) (*Master, *etcdtesting.EtcdTestServer, Config, *assert.Assertions) {
 	_, etcdserver, config, assert := setUp(t)
 	config.APIResourceConfigSource = limitedAPIResourceConfigSource()
-	master, err := New(&config)
+	master, err := config.New()
 	if err != nil {
 		t.Fatalf("Error in bringing up the master: %v", err)
 	}
@@ -1262,7 +1262,7 @@ func TestValidOpenAPISpec(t *testing.T) {
 			Version: "unversioned",
 		},
 	}
-	master, err := New(&config)
+	master, err := config.New()
 	if err != nil {
 		t.Fatalf("Error in bringing up the master: %v", err)
 	}

test/integration/auth/accessreview_test.go

@@ -67,7 +67,7 @@ func TestSubjectAccessReview(t *testing.T) {
 	masterConfig.Authenticator = authenticator.RequestFunc(alwaysAlice)
 	masterConfig.Authorizer = sarAuthorizer{}
 	masterConfig.AdmissionControl = admit.NewAlwaysAdmit()
-	m, err := master.New(masterConfig)
+	m, err := masterConfig.New()
 	if err != nil {
 		t.Fatalf("error in bringing up the master: %v", err)
 	}
@@ -169,7 +169,7 @@ func TestSelfSubjectAccessReview(t *testing.T) {
 	})
 	masterConfig.Authorizer = sarAuthorizer{}
 	masterConfig.AdmissionControl = admit.NewAlwaysAdmit()
-	m, err := master.New(masterConfig)
+	m, err := masterConfig.New()
 	if err != nil {
 		t.Fatalf("error in bringing up the master: %v", err)
 	}
@@ -257,7 +257,7 @@ func TestLocalSubjectAccessReview(t *testing.T) {
 	masterConfig.Authenticator = authenticator.RequestFunc(alwaysAlice)
 	masterConfig.Authorizer = sarAuthorizer{}
 	masterConfig.AdmissionControl = admit.NewAlwaysAdmit()
-	m, err := master.New(masterConfig)
+	m, err := masterConfig.New()
 	if err != nil {
 		t.Fatalf("error in bringing up the master: %v", err)
 	}

test/integration/framework/master_utils.go

@@ -149,7 +149,7 @@ func startMasterOrDie(masterConfig *master.Config) (*master.Master, *httptest.Se
 			},
 		}
 	}
-	m, err := master.New(masterConfig)
+	m, err := masterConfig.New()
 	if err != nil {
 		glog.Fatalf("error in bringing up the master: %v", err)
 	}

test/integration/quota/quota_test.go

@@ -73,7 +73,7 @@ func TestQuota(t *testing.T) {
 
 	masterConfig := framework.NewIntegrationTestMasterConfig()
 	masterConfig.AdmissionControl = admission
-	m, err = master.New(masterConfig)
+	m, err = masterConfig.New()
 	if err != nil {
 		t.Fatalf("Error in bringing up the master: %v", err)
 	}

test/integration/scheduler_perf/util.go

@@ -48,7 +48,7 @@ func mustSetupScheduler() (schedulerConfigFactory *factory.ConfigFactory, destro
 
 	var m *master.Master
 	masterConfig := framework.NewIntegrationTestMasterConfig()
-	m, err := master.New(masterConfig)
+	m, err := masterConfig.New()
 	if err != nil {
 		panic("error in brining up the master: " + err.Error())
 	}

test/integration/serviceaccount/service_account_test.go

@@ -412,7 +412,7 @@ func startServiceAccountTestServer(t *testing.T) (*clientset.Clientset, restclie
 	masterConfig.AdmissionControl = serviceAccountAdmission
 
 	// Create a master and install handlers into mux.
-	m, err := master.New(masterConfig)
+	m, err := masterConfig.New()
 	if err != nil {
 		t.Fatalf("Error in bringing up the master: %v", err)
 	}