From 58dde796ec5833cbfe3160f76db3c67b597e1a8e Mon Sep 17 00:00:00 2001 From: Eric Chiang Date: Thu, 16 Feb 2017 08:50:38 -0800 Subject: [PATCH] client-go: don't import client auth provider packages --- cmd/kubectl/app/kubectl.go | 1 + .../go2idl/client-gen/generators/generator_for_clientset.go | 2 -- staging/src/k8s.io/client-go/discovery/helper.go | 2 -- staging/src/k8s.io/client-go/kubernetes/clientset.go | 1 - 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cmd/kubectl/app/kubectl.go b/cmd/kubectl/app/kubectl.go index 851c6c4deb..536aa57b95 100644 --- a/cmd/kubectl/app/kubectl.go +++ b/cmd/kubectl/app/kubectl.go @@ -19,6 +19,7 @@ package app import ( "os" + _ "k8s.io/client-go/plugin/pkg/client/auth" // kubectl auth providers. _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration "k8s.io/kubernetes/pkg/kubectl/cmd" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go index 189c867f08..f92d9bc4b4 100644 --- a/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go +++ b/cmd/libs/go2idl/client-gen/generators/generator_for_clientset.go @@ -63,8 +63,6 @@ func (g *genClientset) Imports(c *generator.Context) (imports []string) { } imports = append(imports, "github.com/golang/glog") imports = append(imports, "k8s.io/client-go/util/flowcontrol") - // import solely to initialize client auth plugins. - imports = append(imports, "_ \"k8s.io/client-go/plugin/pkg/client/auth\"") return } diff --git a/staging/src/k8s.io/client-go/discovery/helper.go b/staging/src/k8s.io/client-go/discovery/helper.go index ac7f661041..f184bc9295 100644 --- a/staging/src/k8s.io/client-go/discovery/helper.go +++ b/staging/src/k8s.io/client-go/discovery/helper.go @@ -23,8 +23,6 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" apimachineryversion "k8s.io/apimachinery/pkg/version" - // Import solely to initialize client auth plugins. - _ "k8s.io/client-go/plugin/pkg/client/auth" ) // MatchesServerVersion queries the server to compares the build version diff --git a/staging/src/k8s.io/client-go/kubernetes/clientset.go b/staging/src/k8s.io/client-go/kubernetes/clientset.go index dcf4891d91..fdc8ceefbd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/clientset.go +++ b/staging/src/k8s.io/client-go/kubernetes/clientset.go @@ -35,7 +35,6 @@ import ( v1alpha1rbac "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1" v1beta1rbac "k8s.io/client-go/kubernetes/typed/rbac/v1beta1" v1beta1storage "k8s.io/client-go/kubernetes/typed/storage/v1beta1" - _ "k8s.io/client-go/plugin/pkg/client/auth" rest "k8s.io/client-go/rest" "k8s.io/client-go/util/flowcontrol" )