kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

run root-rewrite-import-client-go-api-types 

Kubernetes-commit: f2d3220a11111f86b2f481e70e3c1ca4f5896f44
This commit is contained in:
Chao Xu 2017-06-22 11:10:11 -07:00 committed by Kubernetes Publisher
parent 150b64eff5
commit 81b7aaaa7d
21 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/admission/plugin/namespace/lifecycle/admission.go
View File

@ -34,7 +34,7 @@ import (
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
corelisters "k8s.io/client-go/listers/core/v1" corelisters "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/pkg/api/v1" "k8s.io/api/core/v1"
) )
const ( const (

2
pkg/admission/plugin/namespace/lifecycle/admission_test.go
View File

@ -32,7 +32,7 @@ import (
informers "k8s.io/client-go/informers" informers "k8s.io/client-go/informers"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/pkg/api/v1" "k8s.io/api/core/v1"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
) )

2
pkg/apis/audit/v1alpha1/generated.pb.go
View File

@ -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_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
import k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime" 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" import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"

2
pkg/apis/audit/v1alpha1/types.generated.go
View File

@ -28,7 +28,7 @@ import (
pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkg4_runtime "k8s.io/apimachinery/pkg/runtime" pkg4_runtime "k8s.io/apimachinery/pkg/runtime"
pkg2_types "k8s.io/apimachinery/pkg/types" 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" "reflect"
"runtime" "runtime"
time "time" time "time"

2
pkg/apis/audit/v1alpha1/types.go
View File

@ -20,7 +20,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types" "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. // Header keys used by the audit system.

2
pkg/apis/audit/v1alpha1/zz_generated.conversion.go
View File

@ -26,7 +26,7 @@ import (
runtime "k8s.io/apimachinery/pkg/runtime" runtime "k8s.io/apimachinery/pkg/runtime"
types "k8s.io/apimachinery/pkg/types" types "k8s.io/apimachinery/pkg/types"
audit "k8s.io/apiserver/pkg/apis/audit" 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" unsafe "unsafe"
) )

2
pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go
View File

@ -24,7 +24,7 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion" conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime" 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" reflect "reflect"
) )

2
pkg/audit/request.go
View File

@ -36,7 +36,7 @@ import (
"k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/apis/audit"
auditinternal "k8s.io/apiserver/pkg/apis/audit" auditinternal "k8s.io/apiserver/pkg/apis/audit"
"k8s.io/apiserver/pkg/authorization/authorizer" "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) { func NewEventFromRequest(req *http.Request, level auditinternal.Level, attribs authorizer.Attributes) (*auditinternal.Event, error) {

2
pkg/endpoints/filters/authorization_test.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
"k8s.io/apiserver/pkg/endpoints/request" "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) { func TestGetAuthorizerAttributes(t *testing.T) {

4
pkg/endpoints/filters/impersonation.go
View File

@ -30,8 +30,8 @@ import (
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
"k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/server/httplog" "k8s.io/apiserver/pkg/server/httplog"
"k8s.io/client-go/pkg/api/v1" "k8s.io/api/core/v1"
authenticationv1 "k8s.io/client-go/pkg/apis/authentication/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 // WithImpersonation is a filter that will inspect and check requests that attempt to change the user.Info for their requests

2
pkg/endpoints/filters/impersonation_test.go
View File

@ -28,7 +28,7 @@ import (
"k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/authorization/authorizer"
"k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/endpoints/request"
authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1" authenticationapi "k8s.io/api/authentication/v1"
) )
type impersonateAuthorizer struct{} type impersonateAuthorizer struct{}

2
pkg/endpoints/filters/legacy_audit.go
View File

@ -32,7 +32,7 @@ import (
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
"k8s.io/apiserver/pkg/endpoints/request" "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{} var _ http.ResponseWriter = &legacyAuditResponseWriter{}

2
pkg/registry/generic/rest/response_checker_test.go
View File

@ -26,7 +26,7 @@ import (
"testing" "testing"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/client-go/pkg/api/v1" "k8s.io/api/core/v1"
) )
func TestGenericHttpResponseChecker(t *testing.T) { func TestGenericHttpResponseChecker(t *testing.T) {

2
pkg/storage/cacher_whitebox_test.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/kubernetes/scheme" "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 // verifies the cacheWatcher.process goroutine is properly cleaned up even if

2
pkg/storage/watch_cache_test.go
View File

@ -31,7 +31,7 @@ import (
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/pkg/api/v1" "k8s.io/api/core/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
) )

2
pkg/util/proxy/proxy.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
listersv1 "k8s.io/client-go/listers/core/v1" 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" "k8s.io/apimachinery/pkg/util/intstr"
) )

2
pkg/util/proxy/proxy_test.go
View File

@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
v1listers "k8s.io/client-go/listers/core/v1" 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" "k8s.io/client-go/tools/cache"
) )

2
plugin/pkg/authenticator/token/webhook/webhook.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/apiserver/pkg/util/webhook" "k8s.io/apiserver/pkg/util/webhook"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" 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 ( var (

2
plugin/pkg/authenticator/token/webhook/webhook_test.go
View File

@ -32,7 +32,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apiserver/pkg/authentication/user" "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" "k8s.io/client-go/tools/clientcmd/api/v1"
) )

2
plugin/pkg/authorizer/webhook/webhook.go
View File

@ -31,7 +31,7 @@ import (
"k8s.io/apiserver/pkg/util/webhook" "k8s.io/apiserver/pkg/util/webhook"
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" 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 ( var (

2
plugin/pkg/authorizer/webhook/webhook_test.go
View File

@ -36,7 +36,7 @@ import (
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authentication/user"
"k8s.io/apiserver/pkg/authorization/authorizer" "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" "k8s.io/client-go/tools/clientcmd/api/v1"
) )