Merge pull request #17316 from deads2k/gv-ClientForVersion

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-24 06:24:28 -08:00
45 changed files with 314 additions and 224 deletions

View File

@@ -133,7 +133,10 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
Object: func() (meta.RESTMapper, runtime.ObjectTyper) {
cfg, err := clientConfig.ClientConfig()
CheckErr(err)
cmdApiVersion := cfg.Version
cmdApiVersion := ""
if cfg.GroupVersion != nil {
cmdApiVersion = cfg.GroupVersion.String()
}
return kubectl.OutputVersionMapper{RESTMapper: mapper, OutputVersion: cmdApiVersion}, api.Scheme
},
@@ -576,7 +579,10 @@ func (f *Factory) PrinterForMapping(cmd *cobra.Command, mapping *meta.RESTMappin
if err != nil {
return nil, err
}
defaultVersion := clientConfig.Version
defaultVersion := ""
if clientConfig.GroupVersion != nil {
defaultVersion = clientConfig.GroupVersion.String()
}
version := OutputVersion(cmd, defaultVersion)
if len(version) == 0 {