github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

run grep-sed

Browse Source
This commit is contained in:
Chao Xu 2015-10-08 20:46:12 -07:00
parent fe7b85f6ea
commit cbeb307a60
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/master/master.go
View File

@ -666,7 +666,7 @@ func (m *Master) init(c *Config) {
if err != nil { if err != nil {
glog.Fatalf("Unable to setup experimental api: %v", err) glog.Fatalf("Unable to setup experimental api: %v", err)
} }
expAPIVersions := []api.GroupVersion{ expAPIVersions := []unversioned.GroupVersion{
{ {
GroupVersion: expVersion.Version, GroupVersion: expVersion.Version,
Version: apiutil.GetVersion(expVersion.Version), Version: apiutil.GetVersion(expVersion.Version),
@ -679,7 +679,7 @@ func (m *Master) init(c *Config) {
group := unversioned.APIGroup{ group := unversioned.APIGroup{
Name: g.Group, Name: g.Group,
Versions: expAPIVersions, Versions: expAPIVersions,
PreferredVersion: api.GroupVersion{GroupVersion: storageVersion, Version: apiutil.GetVersion(storageVersion)}, PreferredVersion: unversioned.GroupVersion{GroupVersion: storageVersion, Version: apiutil.GetVersion(storageVersion)},
} }
apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("extensions").Group+"/", group) apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("extensions").Group+"/", group)
allGroups = append(allGroups, group) allGroups = append(allGroups, group)
@ -992,13 +992,13 @@ func (m *Master) InstallThirdPartyResource(rsrc *expapi.ThirdPartyResource) erro
glog.Fatalf("Unable to setup thirdparty api: %v", err) glog.Fatalf("Unable to setup thirdparty api: %v", err)
} }
path := makeThirdPartyPath(group) path := makeThirdPartyPath(group)
groupVersion := api.GroupVersion{ groupVersion := unversioned.GroupVersion{
GroupVersion: group + "/" + rsrc.Versions[0].Name, GroupVersion: group + "/" + rsrc.Versions[0].Name,
Version: rsrc.Versions[0].Name, Version: rsrc.Versions[0].Name,
} }
apiGroup := unversioned.APIGroup{ apiGroup := unversioned.APIGroup{
Name: group, Name: group,
Versions: []api.GroupVersion{groupVersion}, Versions: []unversioned.GroupVersion{groupVersion},
} }
apiserver.AddGroupWebService(m.handlerContainer, path, apiGroup) apiserver.AddGroupWebService(m.handlerContainer, path, apiGroup)
m.addThirdPartyResourceStorage(path, thirdparty.Storage[strings.ToLower(kind)+"s"].(*thirdpartyresourcedataetcd.REST)) m.addThirdPartyResourceStorage(path, thirdparty.Storage[strings.ToLower(kind)+"s"].(*thirdpartyresourcedataetcd.REST))

5
pkg/master/master_test.go
View File

@ -54,7 +54,6 @@ import (
"k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util"
"github.com/coreos/go-etcd/etcd" "github.com/coreos/go-etcd/etcd"
"github.com/emicklei/go-restful"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )
@ -472,13 +471,13 @@ func TestDiscoveryAtAPIS(t *testing.T) {
} }
expectGroupName := "extensions" expectGroupName := "extensions"
expectVersions := []api.GroupVersion{ expectVersions := []unversioned.GroupVersion{
{ {
GroupVersion: testapi.Extensions.GroupAndVersion(), GroupVersion: testapi.Extensions.GroupAndVersion(),
Version: testapi.Extensions.Version(), Version: testapi.Extensions.Version(),
}, },
} }
expectPreferredVersion := api.GroupVersion{ expectPreferredVersion := unversioned.GroupVersion{
GroupVersion: config.StorageVersions["extensions"], GroupVersion: config.StorageVersions["extensions"],
Version: apiutil.GetVersion(config.StorageVersions["extensions"]), Version: apiutil.GetVersion(config.StorageVersions["extensions"]),
} }