scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-27 03:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

udpate some examples to use external types

Browse Source
This commit is contained in:
David Eads
2018-05-02 16:25:48 -04:00
parent b8aa7baa7d
commit a53a72e238
11 changed files with 159 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/kubectl/resource/builder.go
View File

@@ -64,7 +64,7 @@ type Builder struct {
objectTyper runtime.ObjectTyper
// codecFactory describes which codecs you want to use
codecFactory *serializer.CodecFactory
negotiatedSerializer runtime.NegotiatedSerializer
// local indicates that we cannot make server calls
local bool
@@ -240,13 +240,19 @@ func (b *Builder) WithScheme(scheme *runtime.Scheme, decodingVersions ...schema.
}
b.objectTyper = scheme
codecFactory := serializer.NewCodecFactory(scheme)
b.codecFactory = &codecFactory
negotiatedSerializer := runtime.NegotiatedSerializer(codecFactory)
// if you specified versions, you're specifying a desire for external types, which you don't want to round-trip through
// internal types
if len(decodingVersions) > 0 {
negotiatedSerializer = &serializer.DirectCodecFactory{CodecFactory: codecFactory}
}
b.negotiatedSerializer = negotiatedSerializer
b.mapper = &mapper{
localFn: b.isLocal,
restMapper: b.restMapper,
clientFn: b.getClient,
decoder: b.codecFactory.UniversalDecoder(decodingVersions...),
decoder: codecFactory.UniversalDecoder(decodingVersions...),
}
return b
@@ -827,8 +833,8 @@ func (b *Builder) getClient(gv schema.GroupVersion) (RESTClient, error) {
return b.fakeClientFn(gv)
}
if b.codecFactory != nil {
return b.clientConfigFn.clientForGroupVersion(gv, b.codecFactory)
if b.negotiatedSerializer != nil {
return b.clientConfigFn.clientForGroupVersion(gv, b.negotiatedSerializer)
}
return b.clientConfigFn.unstructuredClientForGroupVersion(gv)