github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-16 03:59:10 +00:00
Code Issues Projects Releases Wiki Activity

remove unnecessarily flexibiliy to simplify the resource builder

Browse Source
This commit is contained in:
David Eads
2018-04-27 08:40:57 -04:00
parent 61fdd880b2
commit 6fbcbc994f
33 changed files with 154 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubectl/cmd/util/factory_builder.go
View File

@@ -25,7 +25,6 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/dynamic"
scaleclient "k8s.io/client-go/scale"
"k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/plugins"
"k8s.io/kubernetes/pkg/kubectl/resource"
@@ -48,7 +47,7 @@ func NewBuilderFactory(clientAccessFactory ClientAccessFactory, objectMappingFac
// NewBuilder returns a new resource builder for structured api objects.
func (f *ring2Factory) NewBuilder() *resource.Builder {
clientMapperFunc := resource.ClientMapperFunc(f.objectMappingFactory.ClientForMapping)
mapper, typer := f.objectMappingFactory.Object()
mapper, _ := f.objectMappingFactory.Object()
unstructuredClientMapperFunc := resource.ClientMapperFunc(f.objectMappingFactory.UnstructuredClientForMapping)
@@ -56,15 +55,12 @@ func (f *ring2Factory) NewBuilder() *resource.Builder {
return resource.NewBuilder(
&resource.Mapper{
RESTMapper: mapper,
ObjectTyper: typer,
ObjectConverter: legacyscheme.Scheme,
ClientMapper: clientMapperFunc,
Decoder: InternalVersionDecoder(),
RESTMapper: mapper,
ClientMapper: clientMapperFunc,
Decoder: InternalVersionDecoder(),
},
&resource.Mapper{
RESTMapper: mapper,
ObjectTyper: typer,
ClientMapper: unstructuredClientMapperFunc,
Decoder: unstructured.UnstructuredJSONScheme,
},