From 9abd27560786d46f6c79f6028b1d99af0a4c8276 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Sat, 4 Feb 2017 08:38:19 -0800 Subject: [PATCH] Switch kubectl version and api-versions to create a discovery client directly. The clientset will throw an error for aggregated apiservers because the clientset looks for specific versions of apis that are compiled into the client. These will be missing from aggregated apiservers. The discoveryclient is fully dynamic and does not rely on compiled in apiversions. --- pkg/kubectl/cmd/apiversions.go | 4 ++-- pkg/kubectl/cmd/version.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/cmd/apiversions.go b/pkg/kubectl/cmd/apiversions.go index e6f47d05343..ad809d577c3 100644 --- a/pkg/kubectl/cmd/apiversions.go +++ b/pkg/kubectl/cmd/apiversions.go @@ -56,12 +56,12 @@ func RunApiVersions(f cmdutil.Factory, w io.Writer) error { printDeprecationWarning("api-versions", "apiversions") } - clientset, err := f.ClientSet() + discoveryclient, err := f.DiscoveryClient() if err != nil { return err } - groupList, err := clientset.Discovery().ServerGroups() + groupList, err := discoveryclient.ServerGroups() if err != nil { return fmt.Errorf("Couldn't get available api versions from server: %v\n", err) } diff --git a/pkg/kubectl/cmd/version.go b/pkg/kubectl/cmd/version.go index 622d927546c..b1c483637dc 100644 --- a/pkg/kubectl/cmd/version.go +++ b/pkg/kubectl/cmd/version.go @@ -61,12 +61,12 @@ func RunVersion(f cmdutil.Factory, out io.Writer, cmd *cobra.Command) error { return nil } - clientset, err := f.ClientSet() + discoveryclient, err := f.DiscoveryClient() if err != nil { return err } - serverVersion, err := clientset.Discovery().ServerVersion() + serverVersion, err := discoveryclient.ServerVersion() if err != nil { return err }