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

aggregator: wire OpenAPI correctly into PrepareRun flow

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2019-07-08 11:37:00 +02:00
parent 7c4329ed45
commit f82bc712de
6 changed files with 76 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/integration/etcd/server.go
View File

@@ -117,7 +117,7 @@ func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOp
t.Fatal(err)
}
kubeClientConfig := restclient.CopyConfig(kubeAPIServer.LoopbackClientConfig)
kubeClientConfig := restclient.CopyConfig(kubeAPIServer.GenericAPIServer.LoopbackClientConfig)
// we make lots of requests, don't be slow
kubeClientConfig.QPS = 99999
@@ -133,7 +133,11 @@ func StartRealMasterOrDie(t *testing.T, configFuncs ...func(*options.ServerRunOp
}
}()
if err := kubeAPIServer.PrepareRun().Run(stopCh); err != nil {
prepared, err := kubeAPIServer.PrepareRun()
if err != nil {
t.Fatal(err)
}
if err := prepared.Run(stopCh); err != nil {
t.Fatal(err)
}
}()