From d0236f17612c527dcc96211b03b1e1b39cee8e1e Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Wed, 14 Sep 2016 11:07:50 +0200 Subject: [PATCH] Create generated client set based on be GroupVersion passed in the config --- .../client-gen/generators/generator_for_group.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go b/cmd/libs/go2idl/client-gen/generators/generator_for_group.go index 75b5478203d..5735341a935 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_group.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_group.go @@ -204,12 +204,10 @@ func setConfigDefaults(config *$.Config|raw$) error { if config.UserAgent == "" { config.UserAgent = $.DefaultKubernetesUserAgent|raw$() } - // TODO: Unconditionally set the config.Version, until we fix the config. - //if config.Version == "" { - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion - //} - + if config.GroupVersion == nil || config.GroupVersion.Group != g.GroupVersion.Group { + copyGroupVersion := g.GroupVersion + config.GroupVersion = ©GroupVersion + } config.NegotiatedSerializer = $.codecs|raw$ if config.QPS == 0 {