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

let apiserver support api discovery

Browse Source
This commit is contained in:
Chao Xu
2015-09-14 20:55:18 -07:00
parent cad5f03311
commit 1278771b34
16 changed files with 277 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/integration/integration.go
View File

@@ -132,11 +132,14 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
// We will fix this by supporting multiple group versions in Config
cl.ExperimentalClient = client.NewExperimentalOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Experimental.Version()})
storageVersions := make(map[string]string)
etcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("").InterfacesFor, testapi.Default.Version(), etcdtest.PathPrefix())
storageVersions[""] = testapi.Default.Version()
if err != nil {
glog.Fatalf("Unable to get etcd storage: %v", err)
}
expEtcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("experimental").InterfacesFor, testapi.Experimental.Version(), etcdtest.PathPrefix())
storageVersions["experimental"] = testapi.Experimental.Version()
if err != nil {
glog.Fatalf("Unable to get etcd storage for experimental: %v", err)
}
@@ -171,6 +174,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
ReadWritePort: portNumber,
PublicAddress: publicAddress,
CacheTimeout: 2 * time.Second,
StorageVersions: storageVersions,
})
handler.delegate = m.Handler