run grep-sed

This commit is contained in:
Chao Xu
2015-10-08 18:33:22 -07:00
parent cbb3deb182
commit e3d984be27
4 changed files with 16 additions and 17 deletions

View File

@@ -651,7 +651,7 @@ func (m *Master) init(c *Config) {
apiserver.InstallServiceErrorHandler(m.handlerContainer, m.newAPIRequestInfoResolver(), apiVersions)
// allGroups records all supported groups at /apis
allGroups := []api.APIGroup{}
allGroups := []unversioned.APIGroup{}
if m.exp {
m.thirdPartyStorage = c.StorageDestinations.APIGroups["extensions"].Default
m.thirdPartyResources = map[string]*thirdpartyresourcedataetcd.REST{}
@@ -675,7 +675,7 @@ func (m *Master) init(c *Config) {
if !found {
glog.Fatalf("Couldn't find storage version of group %v", g.Group)
}
group := api.APIGroup{
group := unversioned.APIGroup{
Name: g.Group,
Versions: expAPIVersions,
PreferredVersion: api.GroupVersion{GroupVersion: storageVersion, Version: apiutil.GetVersion(storageVersion)},
@@ -995,7 +995,7 @@ func (m *Master) InstallThirdPartyResource(rsrc *expapi.ThirdPartyResource) erro
GroupVersion: group + "/" + rsrc.Versions[0].Name,
Version: rsrc.Versions[0].Name,
}
apiGroup := api.APIGroup{
apiGroup := unversioned.APIGroup{
Name: group,
Versions: []api.GroupVersion{groupVersion},
}