From 1a4ab05afd7ea9cda5164224a30a306ba797a545 Mon Sep 17 00:00:00 2001 From: juanvallejo Date: Fri, 20 Oct 2017 13:16:30 -0400 Subject: [PATCH] UPSTREAM: 45743: partial pick of 45743 to fix config groupversion defaults --- .../kubernetes/pkg/client/unversioned/helper.go | 11 ++++------- .../kubernetes/pkg/client/unversioned/helper_test.go | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/client/unversioned/helper.go b/vendor/k8s.io/kubernetes/pkg/client/unversioned/helper.go index c8d09ef41e7a..74baf75d0d5e 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/unversioned/helper.go +++ b/vendor/k8s.io/kubernetes/pkg/client/unversioned/helper.go @@ -17,6 +17,7 @@ limitations under the License. package unversioned import ( + "k8s.io/apimachinery/pkg/runtime/schema" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" // Import solely to initialize client auth plugins. @@ -35,13 +36,9 @@ func SetKubernetesDefaults(config *restclient.Config) error { if config.APIPath == "" { config.APIPath = legacyAPIPath } - if config.GroupVersion == nil || config.GroupVersion.Group != api.GroupName { - g, err := api.Registry.Group(api.GroupName) - if err != nil { - return err - } - copyGroupVersion := g.GroupVersion - config.GroupVersion = ©GroupVersion + // TODO chase down uses and tolerate nil + if config.GroupVersion == nil { + config.GroupVersion = &schema.GroupVersion{} } if config.NegotiatedSerializer == nil { config.NegotiatedSerializer = api.Codecs diff --git a/vendor/k8s.io/kubernetes/pkg/client/unversioned/helper_test.go b/vendor/k8s.io/kubernetes/pkg/client/unversioned/helper_test.go index 3e884accaa6c..52966101591e 100644 --- a/vendor/k8s.io/kubernetes/pkg/client/unversioned/helper_test.go +++ b/vendor/k8s.io/kubernetes/pkg/client/unversioned/helper_test.go @@ -42,7 +42,7 @@ func TestSetKubernetesDefaults(t *testing.T) { restclient.Config{ APIPath: "/api", ContentConfig: restclient.ContentConfig{ - GroupVersion: &api.Registry.GroupOrDie(api.GroupName).GroupVersion, + GroupVersion: &schema.GroupVersion{}, NegotiatedSerializer: testapi.Default.NegotiatedSerializer(), }, },