Decouple defaulting from genericapiserver and master
This commit is contained in:
@@ -149,7 +149,7 @@ func startMasterOrDie(masterConfig *master.Config) (*master.Master, *httptest.Se
|
||||
},
|
||||
}
|
||||
}
|
||||
m, err := masterConfig.New()
|
||||
m, err := masterConfig.Complete().New()
|
||||
if err != nil {
|
||||
glog.Fatalf("error in bringing up the master: %v", err)
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@ func TestQuota(t *testing.T) {
|
||||
|
||||
masterConfig := framework.NewIntegrationTestMasterConfig()
|
||||
masterConfig.AdmissionControl = admission
|
||||
m, err = masterConfig.New()
|
||||
m, err = masterConfig.Complete().New()
|
||||
if err != nil {
|
||||
t.Fatalf("Error in bringing up the master: %v", err)
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ func mustSetupScheduler() (schedulerConfigFactory *factory.ConfigFactory, destro
|
||||
|
||||
var m *master.Master
|
||||
masterConfig := framework.NewIntegrationTestMasterConfig()
|
||||
m, err := masterConfig.New()
|
||||
m, err := masterConfig.Complete().New()
|
||||
if err != nil {
|
||||
panic("error in brining up the master: " + err.Error())
|
||||
}
|
||||
|
||||
@@ -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 := masterConfig.New()
|
||||
m, err := masterConfig.Complete().New()
|
||||
if err != nil {
|
||||
t.Fatalf("Error in bringing up the master: %v", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user