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

Decouple defaulting from genericapiserver and master

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2016-09-27 17:52:31 +02:00
parent b4c6a68036
commit 8391a19b57
11 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/master/master_test.go
View File

@@ -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 := config.New()
master, err := config.Complete().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 := config.New()
master, err := config.Complete().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 := config.New()
master, err := config.Complete().New()
if err != nil {
t.Fatalf("Error in bringing up the master: %v", err)
}