From 81b7aaaa7d5304a7af233b17760537c6cff08c8b Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 22 Jun 2017 11:10:11 -0700 Subject: [PATCH] run root-rewrite-import-client-go-api-types Kubernetes-commit: f2d3220a11111f86b2f481e70e3c1ca4f5896f44 --- pkg/admission/plugin/namespace/lifecycle/admission.go | 2 +- pkg/admission/plugin/namespace/lifecycle/admission_test.go | 2 +- pkg/apis/audit/v1alpha1/generated.pb.go | 2 +- pkg/apis/audit/v1alpha1/types.generated.go | 2 +- pkg/apis/audit/v1alpha1/types.go | 2 +- pkg/apis/audit/v1alpha1/zz_generated.conversion.go | 2 +- pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go | 2 +- pkg/audit/request.go | 2 +- pkg/endpoints/filters/authorization_test.go | 2 +- pkg/endpoints/filters/impersonation.go | 4 ++-- pkg/endpoints/filters/impersonation_test.go | 2 +- pkg/endpoints/filters/legacy_audit.go | 2 +- pkg/registry/generic/rest/response_checker_test.go | 2 +- pkg/storage/cacher_whitebox_test.go | 2 +- pkg/storage/watch_cache_test.go | 2 +- pkg/util/proxy/proxy.go | 2 +- pkg/util/proxy/proxy_test.go | 2 +- plugin/pkg/authenticator/token/webhook/webhook.go | 2 +- plugin/pkg/authenticator/token/webhook/webhook_test.go | 2 +- plugin/pkg/authorizer/webhook/webhook.go | 2 +- plugin/pkg/authorizer/webhook/webhook_test.go | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkg/admission/plugin/namespace/lifecycle/admission.go b/pkg/admission/plugin/namespace/lifecycle/admission.go index e01445621..fe2ebfd58 100644 --- a/pkg/admission/plugin/namespace/lifecycle/admission.go +++ b/pkg/admission/plugin/namespace/lifecycle/admission.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" corelisters "k8s.io/client-go/listers/core/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) const ( diff --git a/pkg/admission/plugin/namespace/lifecycle/admission_test.go b/pkg/admission/plugin/namespace/lifecycle/admission_test.go index 7b2e2b064..814b0a0e3 100644 --- a/pkg/admission/plugin/namespace/lifecycle/admission_test.go +++ b/pkg/admission/plugin/namespace/lifecycle/admission_test.go @@ -32,7 +32,7 @@ import ( informers "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" core "k8s.io/client-go/testing" ) diff --git a/pkg/apis/audit/v1alpha1/generated.pb.go b/pkg/apis/audit/v1alpha1/generated.pb.go index 7b60d8e0b..d72ec502f 100644 --- a/pkg/apis/audit/v1alpha1/generated.pb.go +++ b/pkg/apis/audit/v1alpha1/generated.pb.go @@ -42,7 +42,7 @@ import math "math" import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" import k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime" -import k8s_io_client_go_pkg_apis_authentication_v1 "k8s.io/client-go/pkg/apis/authentication/v1" +import k8s_io_client_go_pkg_apis_authentication_v1 "k8s.io/api/authentication/v1" import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types" diff --git a/pkg/apis/audit/v1alpha1/types.generated.go b/pkg/apis/audit/v1alpha1/types.generated.go index 8491d108f..7673ab89a 100644 --- a/pkg/apis/audit/v1alpha1/types.generated.go +++ b/pkg/apis/audit/v1alpha1/types.generated.go @@ -28,7 +28,7 @@ import ( pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg4_runtime "k8s.io/apimachinery/pkg/runtime" pkg2_types "k8s.io/apimachinery/pkg/types" - pkg3_v1 "k8s.io/client-go/pkg/apis/authentication/v1" + pkg3_v1 "k8s.io/api/authentication/v1" "reflect" "runtime" time "time" diff --git a/pkg/apis/audit/v1alpha1/types.go b/pkg/apis/audit/v1alpha1/types.go index 3d9049a1e..0552191f1 100644 --- a/pkg/apis/audit/v1alpha1/types.go +++ b/pkg/apis/audit/v1alpha1/types.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - authnv1 "k8s.io/client-go/pkg/apis/authentication/v1" + authnv1 "k8s.io/api/authentication/v1" ) // Header keys used by the audit system. diff --git a/pkg/apis/audit/v1alpha1/zz_generated.conversion.go b/pkg/apis/audit/v1alpha1/zz_generated.conversion.go index ed4ed2fc2..3835763d8 100644 --- a/pkg/apis/audit/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/audit/v1alpha1/zz_generated.conversion.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" types "k8s.io/apimachinery/pkg/types" audit "k8s.io/apiserver/pkg/apis/audit" - authentication_v1 "k8s.io/client-go/pkg/apis/authentication/v1" + authentication_v1 "k8s.io/api/authentication/v1" unsafe "unsafe" ) diff --git a/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go index 42533cbd6..ee833af96 100644 --- a/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - authentication_v1 "k8s.io/client-go/pkg/apis/authentication/v1" + authentication_v1 "k8s.io/api/authentication/v1" reflect "reflect" ) diff --git a/pkg/audit/request.go b/pkg/audit/request.go index e9a2c19fd..e1575fb5e 100644 --- a/pkg/audit/request.go +++ b/pkg/audit/request.go @@ -36,7 +36,7 @@ import ( "k8s.io/apiserver/pkg/apis/audit" auditinternal "k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/authorization/authorizer" - authenticationv1 "k8s.io/client-go/pkg/apis/authentication/v1" + authenticationv1 "k8s.io/api/authentication/v1" ) func NewEventFromRequest(req *http.Request, level auditinternal.Level, attribs authorizer.Attributes) (*auditinternal.Event, error) { diff --git a/pkg/endpoints/filters/authorization_test.go b/pkg/endpoints/filters/authorization_test.go index a27577540..656d9bc5d 100644 --- a/pkg/endpoints/filters/authorization_test.go +++ b/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" - batch "k8s.io/client-go/pkg/apis/batch/v1" + batch "k8s.io/api/batch/v1" ) func TestGetAuthorizerAttributes(t *testing.T) { diff --git a/pkg/endpoints/filters/impersonation.go b/pkg/endpoints/filters/impersonation.go index 16a00c434..6bbe33546 100644 --- a/pkg/endpoints/filters/impersonation.go +++ b/pkg/endpoints/filters/impersonation.go @@ -30,8 +30,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/server/httplog" - "k8s.io/client-go/pkg/api/v1" - authenticationv1 "k8s.io/client-go/pkg/apis/authentication/v1" + "k8s.io/api/core/v1" + authenticationv1 "k8s.io/api/authentication/v1" ) // WithImpersonation is a filter that will inspect and check requests that attempt to change the user.Info for their requests diff --git a/pkg/endpoints/filters/impersonation_test.go b/pkg/endpoints/filters/impersonation_test.go index cf5ed9b73..1ce3ca45c 100644 --- a/pkg/endpoints/filters/impersonation_test.go +++ b/pkg/endpoints/filters/impersonation_test.go @@ -28,7 +28,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/v1" + authenticationapi "k8s.io/api/authentication/v1" ) type impersonateAuthorizer struct{} diff --git a/pkg/endpoints/filters/legacy_audit.go b/pkg/endpoints/filters/legacy_audit.go index 692895eae..9168f642a 100644 --- a/pkg/endpoints/filters/legacy_audit.go +++ b/pkg/endpoints/filters/legacy_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/v1" + authenticationapi "k8s.io/api/authentication/v1" ) var _ http.ResponseWriter = &legacyAuditResponseWriter{} diff --git a/pkg/registry/generic/rest/response_checker_test.go b/pkg/registry/generic/rest/response_checker_test.go index 73460536e..9f4155840 100644 --- a/pkg/registry/generic/rest/response_checker_test.go +++ b/pkg/registry/generic/rest/response_checker_test.go @@ -26,7 +26,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func TestGenericHttpResponseChecker(t *testing.T) { diff --git a/pkg/storage/cacher_whitebox_test.go b/pkg/storage/cacher_whitebox_test.go index b8973d0b6..80260522c 100644 --- a/pkg/storage/cacher_whitebox_test.go +++ b/pkg/storage/cacher_whitebox_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // verifies the cacheWatcher.process goroutine is properly cleaned up even if diff --git a/pkg/storage/watch_cache_test.go b/pkg/storage/watch_cache_test.go index 9f8a360e0..84e704730 100644 --- a/pkg/storage/watch_cache_test.go +++ b/pkg/storage/watch_cache_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/pkg/util/proxy/proxy.go b/pkg/util/proxy/proxy.go index db631dfde..c639b28c6 100644 --- a/pkg/util/proxy/proxy.go +++ b/pkg/util/proxy/proxy.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" listersv1 "k8s.io/client-go/listers/core/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/pkg/util/proxy/proxy_test.go b/pkg/util/proxy/proxy_test.go index f21cfeed1..5636d5efb 100644 --- a/pkg/util/proxy/proxy_test.go +++ b/pkg/util/proxy/proxy_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" v1listers "k8s.io/client-go/listers/core/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/plugin/pkg/authenticator/token/webhook/webhook.go b/plugin/pkg/authenticator/token/webhook/webhook.go index 3da650673..498eac550 100644 --- a/plugin/pkg/authenticator/token/webhook/webhook.go +++ b/plugin/pkg/authenticator/token/webhook/webhook.go @@ -29,7 +29,7 @@ import ( "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/kubernetes/scheme" authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" - authentication "k8s.io/client-go/pkg/apis/authentication/v1beta1" + authentication "k8s.io/api/authentication/v1beta1" ) var ( diff --git a/plugin/pkg/authenticator/token/webhook/webhook_test.go b/plugin/pkg/authenticator/token/webhook/webhook_test.go index 0e48e5598..adffe4348 100644 --- a/plugin/pkg/authenticator/token/webhook/webhook_test.go +++ b/plugin/pkg/authenticator/token/webhook/webhook_test.go @@ -32,7 +32,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/client-go/pkg/apis/authentication/v1beta1" + "k8s.io/api/authentication/v1beta1" "k8s.io/client-go/tools/clientcmd/api/v1" ) diff --git a/plugin/pkg/authorizer/webhook/webhook.go b/plugin/pkg/authorizer/webhook/webhook.go index 91f233b14..e48f8f723 100644 --- a/plugin/pkg/authorizer/webhook/webhook.go +++ b/plugin/pkg/authorizer/webhook/webhook.go @@ -31,7 +31,7 @@ import ( "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/kubernetes/scheme" authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" - authorization "k8s.io/client-go/pkg/apis/authorization/v1beta1" + authorization "k8s.io/api/authorization/v1beta1" ) var ( diff --git a/plugin/pkg/authorizer/webhook/webhook_test.go b/plugin/pkg/authorizer/webhook/webhook_test.go index 85bca35ce..4c66b0130 100644 --- a/plugin/pkg/authorizer/webhook/webhook_test.go +++ b/plugin/pkg/authorizer/webhook/webhook_test.go @@ -36,7 +36,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" - "k8s.io/client-go/pkg/apis/authorization/v1beta1" + "k8s.io/api/authorization/v1beta1" "k8s.io/client-go/tools/clientcmd/api/v1" )