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

Merge pull request #32897 from deads2k/api-07-remove-dead-mapper

Browse Source 
Automatic merge from submit-queue

remove dead mapper

Removing a write-only field I found looking at the registration code.
This commit is contained in:
Kubernetes Submit Queue
2016-09-19 23:12:06 -07:00
committed by GitHub
parent 7e9f19bb96 4aa61ddcb2
commit 8d0518d4d2
18 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/install/install.go
View File

@@ -76,7 +76,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
federation/apis/core/install/install.go
View File

@@ -81,7 +81,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
federation/apis/federation/install/install.go
View File

@@ -81,7 +81,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/api/install/install.go
View File

@@ -82,7 +82,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

10
pkg/api/mapper.go
View File

@@ -25,16 +25,6 @@ import (
"k8s.io/kubernetes/pkg/util/sets"
)
var RESTMapper meta.RESTMapper
func init() {
RESTMapper = meta.MultiRESTMapper{}
}
func RegisterRESTMapper(m meta.RESTMapper) {
RESTMapper = append(RESTMapper.(meta.MultiRESTMapper), m)
}
// Instantiates a DefaultRESTMapper based on types registered in api.Scheme
func NewDefaultRESTMapper(defaultGroupVersions []unversioned.GroupVersion, interfacesFunc meta.VersionInterfacesFunc,
importPathPrefix string, ignoredKinds, rootScoped sets.String) *meta.DefaultRESTMapper {

2
pkg/apimachinery/announced/group_factory.go
View File

@@ -243,7 +243,5 @@ func (gmf *GroupMetaFactory) RegisterAndEnable() error {
return err
}
// TODO: find a sane way to register the rest mappers.
api.RegisterRESTMapper(registered.GroupOrDie(gmf.GroupArgs.GroupName).RESTMapper)
return nil
}

1
pkg/apis/apps/install/install.go
View File

@@ -79,7 +79,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/apis/authentication/install/install.go
View File

@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/apis/authorization/install/install.go
View File

@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/apis/autoscaling/install/install.go
View File

@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/apis/certificates/install/install.go
View File

@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/apis/componentconfig/install/install.go
View File

@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/apis/extensions/install/install.go
View File

@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/apis/imagepolicy/install/install.go
View File

@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/apis/policy/install/install.go
View File

@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/apis/rbac/install/install.go
View File

@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

1
pkg/apis/storage/install/install.go
View File

@@ -83,7 +83,6 @@ func enableVersions(externalVersions []unversioned.GroupVersion) error {
if err := registered.RegisterGroup(groupMeta); err != nil {
return err
}
api.RegisterRESTMapper(groupMeta.RESTMapper)
return nil
}

2
pkg/kubectl/cmd/util/factory.go
View File

@@ -710,7 +710,6 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
c: restclient,
fedc: fedClient,
cacheDir: dir,
mapper: api.RESTMapper,
}, nil
}
return validation.NullSchema{}, nil
@@ -973,7 +972,6 @@ type clientSwaggerSchema struct {
c *restclient.RESTClient
fedc *restclient.RESTClient
cacheDir string
mapper meta.RESTMapper
}
const schemaFileName = "schema.json"