From 5894834cc88f05a794c60ede4420559c6f087bd1 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Wed, 14 Sep 2016 11:08:58 +0200 Subject: [PATCH] Generated changes for clientset --- .../testgroup.k8s.io/unversioned/testgroup_client.go | 10 ++++------ .../typed/core/unversioned/core_client.go | 10 ++++------ .../typed/extensions/unversioned/extensions_client.go | 10 ++++------ .../typed/federation/unversioned/federation_client.go | 10 ++++------ .../typed/apps/unversioned/apps_client.go | 10 ++++------ .../unversioned/authentication_client.go | 10 ++++------ .../authorization/unversioned/authorization_client.go | 10 ++++------ .../autoscaling/unversioned/autoscaling_client.go | 10 ++++------ .../typed/batch/unversioned/batch_client.go | 10 ++++------ .../certificates/unversioned/certificates_client.go | 10 ++++------ .../typed/core/unversioned/core_client.go | 10 ++++------ .../typed/extensions/unversioned/extensions_client.go | 10 ++++------ .../typed/rbac/unversioned/rbac_client.go | 10 ++++------ .../typed/storage/unversioned/storage_client.go | 10 ++++------ 14 files changed, 56 insertions(+), 84 deletions(-) diff --git a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go index 3f7c4e24995..d324770d55a 100644 --- a/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go +++ b/cmd/libs/go2idl/client-gen/testoutput/clientset_generated/test_internalclientset/typed/testgroup.k8s.io/unversioned/testgroup_client.go @@ -74,12 +74,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go index 91a9e07908f..66fe7294b85 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/core/unversioned/core_client.go @@ -89,12 +89,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go index b55aac1ddce..e1f8dccbb12 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/extensions/unversioned/extensions_client.go @@ -79,12 +79,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/federation_client.go b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/federation_client.go index 89943315434..12c33129f66 100644 --- a/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/federation_client.go +++ b/federation/client/clientset_generated/federation_internalclientset/typed/federation/unversioned/federation_client.go @@ -74,12 +74,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go b/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go index f0ea95c1c2e..6d9edf7b57f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/apps/unversioned/apps_client.go @@ -74,12 +74,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go b/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go index 3606fdb935e..10d354a9686 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authentication/unversioned/authentication_client.go @@ -74,12 +74,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go index b07517c8a54..88b7c540463 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/authorization/unversioned/authorization_client.go @@ -84,12 +84,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go index 71d01ff6dd8..114264c793f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/autoscaling/unversioned/autoscaling_client.go @@ -74,12 +74,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go index 8f2b0e80386..f924797d5e4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/batch/unversioned/batch_client.go @@ -79,12 +79,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go index c11bff9a9b9..f0a3d82f26d 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/certificates/unversioned/certificates_client.go @@ -74,12 +74,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go index 1e066dec903..e44eaf8bdee 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/core/unversioned/core_client.go @@ -149,12 +149,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go index 7a6f8248f44..b1e281e099f 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/extensions/unversioned/extensions_client.go @@ -109,12 +109,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go index fa2f336fe77..b3a64991585 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/rbac/unversioned/rbac_client.go @@ -89,12 +89,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 { diff --git a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go b/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go index 9c65356b9c1..3d95a3f86c8 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go +++ b/pkg/client/clientset_generated/internalclientset/typed/storage/unversioned/storage_client.go @@ -74,12 +74,10 @@ func setConfigDefaults(config *restclient.Config) error { if config.UserAgent == "" { config.UserAgent = restclient.DefaultKubernetesUserAgent() } - // 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 = api.Codecs if config.QPS == 0 {