From c354076aa41e3cf417b291d5f0eff2b70395ac30 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 10 May 2017 17:56:53 -0700 Subject: [PATCH] remove invocation of k8s.io/client-go/pkg/api/install change import of client-go/api/helper to kubernetes/api/helper remove unnecessary use of client-go/api.registry change use of client-go/pkg/util to kubernetes/pkg/util remove dependency on client-go/pkg/apis/extensions remove unnecessary invocation of k8s.io/client-go/extension/intsall change use of k8s.io/client-go/pkg/apis/authentication to v1 --- cmd/kube-proxy/app/server.go | 2 +- pkg/client/tests/fake_client_test.go | 1 - pkg/controller/bootstrap/common_test.go | 2 +- pkg/controller/controller_ref_manager_test.go | 4 ++-- .../podautoscaler/metrics/rest_metrics_client_test.go | 4 ---- staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go | 2 +- .../apiserver/pkg/endpoints/filters/authorization_test.go | 2 +- .../apiserver/pkg/endpoints/filters/impersonation_test.go | 2 +- .../src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go | 3 --- .../src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go | 1 - staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go | 2 -- .../apiserver/plugin/pkg/authorizer/webhook/webhook.go | 2 -- .../pkg/apis/apiextensions/install/install.go | 5 ----- 13 files changed, 7 insertions(+), 25 deletions(-) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index e7af2601b34..4549d07cdf2 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -38,7 +38,6 @@ import ( clientgoclientset "k8s.io/client-go/kubernetes" v1core "k8s.io/client-go/kubernetes/typed/core/v1" clientv1 "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/util" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/tools/record" @@ -55,6 +54,7 @@ import ( "k8s.io/kubernetes/pkg/proxy/iptables" "k8s.io/kubernetes/pkg/proxy/userspace" "k8s.io/kubernetes/pkg/proxy/winuserspace" + "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/configz" utildbus "k8s.io/kubernetes/pkg/util/dbus" "k8s.io/kubernetes/pkg/util/exec" diff --git a/pkg/client/tests/fake_client_test.go b/pkg/client/tests/fake_client_test.go index dfcb973852f..25b3dc03de5 100644 --- a/pkg/client/tests/fake_client_test.go +++ b/pkg/client/tests/fake_client_test.go @@ -23,7 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api" clientsetfake "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - _ "k8s.io/client-go/pkg/api/install" _ "k8s.io/kubernetes/pkg/api/install" ) diff --git a/pkg/controller/bootstrap/common_test.go b/pkg/controller/bootstrap/common_test.go index 4da2a0966e3..5c7b356779b 100644 --- a/pkg/controller/bootstrap/common_test.go +++ b/pkg/controller/bootstrap/common_test.go @@ -22,9 +22,9 @@ import ( "github.com/davecgh/go-spew/spew" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/helper" "k8s.io/client-go/pkg/api/v1" core "k8s.io/client-go/testing" + "k8s.io/kubernetes/pkg/api/helper" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" ) diff --git a/pkg/controller/controller_ref_manager_test.go b/pkg/controller/controller_ref_manager_test.go index 6a3045f83f2..cea1267ade8 100644 --- a/pkg/controller/controller_ref_manager_test.go +++ b/pkg/controller/controller_ref_manager_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/apis/extensions" + "k8s.io/client-go/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -37,7 +37,7 @@ var ( ) func newControllerRef(controller metav1.Object) *metav1.OwnerReference { - var controllerKind = extensions.SchemeGroupVersion.WithKind("Fake") + var controllerKind = v1beta1.SchemeGroupVersion.WithKind("Fake") blockOwnerDeletion := true isController := true return &metav1.OwnerReference{ diff --git a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go index 7ded3de6c37..1e39e272455 100644 --- a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go @@ -38,10 +38,6 @@ import ( metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1" "github.com/stretchr/testify/assert" - - // we need the API types for rest mapping lookup - _ "k8s.io/client-go/pkg/api/install" - _ "k8s.io/client-go/pkg/apis/extensions/install" ) type restClientTestCase struct { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go index d84d46e3c7f..9aefc96763a 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go @@ -32,7 +32,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/request" - authenticationapi "k8s.io/client-go/pkg/apis/authentication" + authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1" ) var _ http.ResponseWriter = &auditResponseWriter{} diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go index 58c5876d522..a27577540f3 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/client-go/pkg/apis/batch" + batch "k8s.io/client-go/pkg/apis/batch/v1" ) func TestGetAuthorizerAttributes(t *testing.T) { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go index d41c7a04027..f2d058252e5 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/endpoints/request" - authenticationapi "k8s.io/client-go/pkg/apis/authentication" + authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1" ) type impersonateAuthorizer struct{} diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go index 0566e241cec..98ec1da996b 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go @@ -39,9 +39,6 @@ import ( examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/rest" - - // need to register pods - _ "k8s.io/client-go/pkg/api/install" ) var ( diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go index e180e47cd90..213e1e4e72b 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go @@ -46,7 +46,6 @@ import ( "golang.org/x/net/context" "k8s.io/apimachinery/pkg/runtime/serializer" - _ "k8s.io/client-go/pkg/api/install" ) var ( diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go index f1a5d95b809..75691e00a9a 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go @@ -18,8 +18,6 @@ package tests import ( "k8s.io/apiserver/pkg/apis/example" - - _ "k8s.io/client-go/pkg/api/install" ) func DeepEqualSafePodSpec() example.PodSpec { diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go index ca4916aea55..34f6785727c 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go +++ b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go @@ -32,8 +32,6 @@ import ( "k8s.io/client-go/kubernetes/scheme" authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" authorization "k8s.io/client-go/pkg/apis/authorization/v1beta1" - - _ "k8s.io/client-go/pkg/apis/authorization/install" ) var ( diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go index 64076de91f2..2a1a9697042 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go @@ -21,15 +21,10 @@ import ( "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/api" "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" ) -func init() { - Install(api.GroupFactoryRegistry, api.Registry, api.Scheme) -} - // Install registers the API group and adds types to a scheme func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory(