run hack/update-all

Kubernetes-commit: 60604f8818aecbc9c3736fbc32747cc0a535bc80

pkg/admission/plugin/namespace/lifecycle/BUILD

@@ -14,6 +14,7 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
@@ -25,7 +26,6 @@ go_library(
         "//vendor/k8s.io/client-go/informers:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/client-go/listers/core/v1:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
     ],
 )
 
@@ -35,6 +35,7 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
+        "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
@@ -46,7 +47,6 @@ go_test(
         "//vendor/k8s.io/client-go/informers:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
         "//vendor/k8s.io/client-go/testing:go_default_library",
     ],
 )

pkg/admission/plugin/namespace/lifecycle/admission.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/golang/glog"
 
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -34,7 +35,6 @@ import (
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
 	corelisters "k8s.io/client-go/listers/core/v1"
-	"k8s.io/api/core/v1"
 )
 
 const (

pkg/admission/plugin/namespace/lifecycle/admission_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 	"time"
 
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -32,7 +33,6 @@ import (
 	informers "k8s.io/client-go/informers"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/api/core/v1"
 	core "k8s.io/client-go/testing"
 )
 

pkg/apis/audit/v1alpha1/BUILD

@@ -23,12 +23,12 @@ go_library(
     deps = [
         "//vendor/github.com/gogo/protobuf/proto:go_default_library",
         "//vendor/github.com/ugorji/go/codec:go_default_library",
+        "//vendor/k8s.io/api/authentication/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/apis/audit:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/authentication/v1:go_default_library",
     ],
 )

pkg/apis/audit/v1alpha1/generated.pb.go

@@ -39,11 +39,10 @@ import proto "github.com/gogo/protobuf/proto"
 import fmt "fmt"
 import math "math"
 
+import k8s_io_api_authentication_v1 "k8s.io/api/authentication/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_client_go_pkg_apis_authentication_v1 "k8s.io/api/authentication/v1"
-
 import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
 
 import strings "strings"
@@ -752,8 +751,8 @@ func (this *Event) String() string {
 		`Stage:` + fmt.Sprintf("%v", this.Stage) + `,`,
 		`RequestURI:` + fmt.Sprintf("%v", this.RequestURI) + `,`,
 		`Verb:` + fmt.Sprintf("%v", this.Verb) + `,`,
-		`User:` + strings.Replace(strings.Replace(this.User.String(), "UserInfo", "k8s_io_client_go_pkg_apis_authentication_v1.UserInfo", 1), `&`, ``, 1) + `,`,
+		`User:` + strings.Replace(strings.Replace(this.User.String(), "UserInfo", "k8s_io_api_authentication_v1.UserInfo", 1), `&`, ``, 1) + `,`,
-		`ImpersonatedUser:` + strings.Replace(fmt.Sprintf("%v", this.ImpersonatedUser), "UserInfo", "k8s_io_client_go_pkg_apis_authentication_v1.UserInfo", 1) + `,`,
+		`ImpersonatedUser:` + strings.Replace(fmt.Sprintf("%v", this.ImpersonatedUser), "UserInfo", "k8s_io_api_authentication_v1.UserInfo", 1) + `,`,
 		`SourceIPs:` + fmt.Sprintf("%v", this.SourceIPs) + `,`,
 		`ObjectRef:` + strings.Replace(fmt.Sprintf("%v", this.ObjectRef), "ObjectReference", "ObjectReference", 1) + `,`,
 		`ResponseStatus:` + strings.Replace(fmt.Sprintf("%v", this.ResponseStatus), "Status", "k8s_io_apimachinery_pkg_apis_meta_v1.Status", 1) + `,`,
@@ -1138,7 +1137,7 @@ func (m *Event) Unmarshal(dAtA []byte) error {
 				return io.ErrUnexpectedEOF
 			}
 			if m.ImpersonatedUser == nil {
-				m.ImpersonatedUser = &k8s_io_client_go_pkg_apis_authentication_v1.UserInfo{}
+				m.ImpersonatedUser = &k8s_io_api_authentication_v1.UserInfo{}
 			}
 			if err := m.ImpersonatedUser.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
@@ -2385,75 +2384,73 @@ func init() {
 }
 
 var fileDescriptorGenerated = []byte{
-	// 1105 bytes of a gzipped FileDescriptorProto
+	// 1088 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4b, 0x6f, 0x23, 0x45,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4d, 0x6f, 0x23, 0x45,
-	0x10, 0xce, 0xac, 0xe3, 0xc4, 0xd3, 0xd9, 0x3c, 0xb6, 0x17, 0xc1, 0x28, 0x07, 0x3b, 0x98, 0x8b,
+	0x10, 0xcd, 0xac, 0xe3, 0x8d, 0xa7, 0xb3, 0xf9, 0xd8, 0x5e, 0x04, 0xa3, 0x1c, 0xec, 0x60, 0x24,
-	0x05, 0xd9, 0x99, 0x24, 0x64, 0xd1, 0x22, 0xc4, 0x21, 0xd6, 0x22, 0x64, 0x29, 0x84, 0xd0, 0x89,
+	0x64, 0x41, 0x98, 0x49, 0x42, 0x40, 0xcb, 0x81, 0x43, 0xac, 0x45, 0x60, 0x29, 0x84, 0xd0, 0x89,
-	0x17, 0xf1, 0x90, 0x60, 0x6c, 0x57, 0xec, 0x21, 0x76, 0xcf, 0xd0, 0xdd, 0xe3, 0x55, 0x6e, 0x1c,
+	0x57, 0xe2, 0xe3, 0x40, 0xdb, 0xae, 0xd8, 0x43, 0xec, 0x9e, 0xa1, 0xbb, 0xc7, 0x28, 0x37, 0x0e,
-	0x10, 0x67, 0xfe, 0x11, 0xe2, 0x80, 0x94, 0xe3, 0x1e, 0xf7, 0x64, 0x11, 0xf3, 0x2f, 0x72, 0x42,
+	0x88, 0x33, 0xff, 0x08, 0x21, 0x81, 0x94, 0xe3, 0x1e, 0xf7, 0x64, 0x11, 0xf3, 0x2f, 0x72, 0x42,
-	0xdd, 0xd3, 0x3d, 0xed, 0xc7, 0x46, 0x78, 0x85, 0xb4, 0xb7, 0xe9, 0xaa, 0xef, 0xfb, 0xba, 0xaa,
+	0xdd, 0xd3, 0x33, 0x3d, 0x76, 0x36, 0xc2, 0xb9, 0xec, 0x6d, 0xba, 0xea, 0xbd, 0xd7, 0x55, 0xe5,
-	0xa6, 0xaa, 0x66, 0xd0, 0x57, 0x97, 0x4f, 0xb8, 0x1f, 0xc5, 0xc1, 0x65, 0xda, 0x02, 0x46, 0x41,
+	0xaa, 0x6a, 0xa3, 0xaf, 0x2f, 0x9e, 0x0a, 0x3f, 0x8c, 0x82, 0x8b, 0xa4, 0x03, 0x9c, 0x81, 0x04,
-	0x00, 0x0f, 0x86, 0x40, 0x3b, 0x31, 0x0b, 0xb4, 0x23, 0x4c, 0x22, 0x0e, 0x6c, 0x08, 0x2c, 0x48,
+	0x11, 0x8c, 0x81, 0xf5, 0x22, 0x1e, 0x18, 0x07, 0x8d, 0x43, 0x01, 0x7c, 0x0c, 0x3c, 0x88, 0x2f,
-	0x2e, 0xbb, 0xea, 0x14, 0x84, 0x69, 0x27, 0x12, 0xc1, 0x70, 0x3f, 0xec, 0x27, 0xbd, 0x70, 0x3f,
+	0xfa, 0xfa, 0x14, 0xd0, 0xa4, 0x17, 0xca, 0x60, 0xbc, 0x47, 0x87, 0xf1, 0x80, 0xee, 0x05, 0x7d,
-	0xe8, 0x02, 0x05, 0x16, 0x0a, 0xe8, 0xf8, 0x09, 0x8b, 0x45, 0x8c, 0x6b, 0x19, 0xd3, 0xcf, 0x99,
+	0x60, 0xc0, 0xa9, 0x84, 0x9e, 0x1f, 0xf3, 0x48, 0x46, 0xb8, 0x91, 0x32, 0xfd, 0x9c, 0xe9, 0xc7,
-	0x7e, 0x72, 0xd9, 0x55, 0x27, 0x5f, 0x31, 0x7d, 0xc3, 0xdc, 0x7e, 0xd4, 0x8d, 0x44, 0x2f, 0x6d,
+	0x17, 0x7d, 0x7d, 0xf2, 0x35, 0xd3, 0xcf, 0x98, 0x5b, 0x1f, 0xf4, 0x43, 0x39, 0x48, 0x3a, 0x7e,
-	0xf9, 0xed, 0x78, 0x10, 0x74, 0xe3, 0x6e, 0x1c, 0x28, 0x81, 0x56, 0x7a, 0xa1, 0x4e, 0xea, 0xa0,
+	0x37, 0x1a, 0x05, 0xfd, 0xa8, 0x1f, 0x05, 0x5a, 0xa0, 0x93, 0x9c, 0xeb, 0x93, 0x3e, 0xe8, 0xaf,
-	0x9e, 0x32, 0xe1, 0xed, 0x43, 0x1b, 0xd2, 0x20, 0x6c, 0xf7, 0x22, 0x0a, 0xec, 0xca, 0x46, 0x35,
+	0x54, 0x78, 0x6b, 0xc7, 0x86, 0x14, 0xd0, 0x44, 0x0e, 0x80, 0xc9, 0xb0, 0x4b, 0x65, 0x18, 0xb1,
-	0x00, 0x11, 0x06, 0xc3, 0xb9, 0x70, 0xb6, 0x83, 0xbb, 0x58, 0x2c, 0xa5, 0x22, 0x1a, 0xc0, 0x1c,
+	0x60, 0x7c, 0x2b, 0x8c, 0xad, 0x03, 0x8b, 0x1e, 0xd1, 0xee, 0x20, 0x64, 0xc0, 0x2f, 0x6d, 0x0e,
-	0xe1, 0xa3, 0xff, 0x22, 0xf0, 0x76, 0x0f, 0x06, 0xe1, 0x1c, 0xef, 0xc3, 0xbb, 0x78, 0xa9, 0x88,
+	0x23, 0x90, 0xf4, 0x55, 0xac, 0xe0, 0x2e, 0x16, 0x4f, 0x98, 0x0c, 0x47, 0x70, 0x8b, 0xf0, 0xf1,
-	0xfa, 0x41, 0x44, 0x05, 0x17, 0x6c, 0x8e, 0xf4, 0x89, 0x26, 0xb5, 0xfb, 0x11, 0x50, 0xf1, 0x48,
+	0xff, 0x11, 0x44, 0x77, 0x00, 0x23, 0x7a, 0x8b, 0xf7, 0xe1, 0x5d, 0xbc, 0x44, 0x86, 0xc3, 0x20,
-	0xd6, 0xc0, 0x96, 0x59, 0xf4, 0x80, 0x8a, 0xa8, 0x1d, 0x8a, 0x28, 0xa6, 0xaf, 0x48, 0xad, 0x3a,
+	0x64, 0x52, 0x48, 0x3e, 0x4f, 0xaa, 0xff, 0x55, 0x41, 0xe5, 0xcf, 0xc6, 0xc0, 0x24, 0xfe, 0x01,
-	0x2e, 0xa1, 0xe2, 0x67, 0x43, 0xa0, 0x02, 0xff, 0x88, 0x4a, 0x32, 0xff, 0x4e, 0x28, 0x42, 0xcf,
+	0x55, 0x54, 0x0a, 0x3d, 0x2a, 0xa9, 0xe7, 0x6c, 0x3b, 0x8d, 0xd5, 0xfd, 0x5d, 0xdf, 0xd6, 0x3d,
-	0xd9, 0x71, 0x6a, 0x6b, 0x07, 0x7b, 0xbe, 0x7d, 0x0d, 0x79, 0x38, 0xf6, 0x4d, 0x48, 0xb4, 0x3f,
+	0x57, 0xb4, 0xa5, 0x57, 0x68, 0x7f, 0xbc, 0xe7, 0x7f, 0xd5, 0xf9, 0x11, 0xba, 0xf2, 0x4b, 0x90,
-	0xdc, 0xf7, 0xbf, 0x6c, 0xfd, 0x04, 0x6d, 0xf1, 0x05, 0x88, 0xb0, 0x8e, 0xaf, 0x47, 0x95, 0xa5,
+	0xb4, 0x89, 0xaf, 0x26, 0xb5, 0xa5, 0xe9, 0xa4, 0x86, 0xac, 0x8d, 0xe4, 0xaa, 0x78, 0x07, 0x95,
-	0xf1, 0xa8, 0x82, 0xac, 0x8d, 0xe4, 0xaa, 0x78, 0x17, 0x15, 0xfb, 0x30, 0x84, 0xbe, 0x77, 0x6f,
+	0x87, 0x30, 0x86, 0xa1, 0xf7, 0x60, 0xdb, 0x69, 0xb8, 0xcd, 0x37, 0x0d, 0xb8, 0x7c, 0xa4, 0x8c,
-	0xc7, 0xa9, 0xb9, 0xf5, 0xb7, 0x35, 0xb8, 0x78, 0x2c, 0x8d, 0xb7, 0xe6, 0x81, 0x64, 0x20, 0xfc,
+	0x37, 0xd9, 0x07, 0x49, 0x41, 0xf8, 0x3b, 0xe4, 0xaa, 0x6c, 0x85, 0xa4, 0xa3, 0xd8, 0x2b, 0xe9,
-	0x1d, 0x72, 0x65, 0xa9, 0xb8, 0x08, 0x07, 0x89, 0x57, 0x50, 0x01, 0xbd, 0xbf, 0x58, 0x40, 0xe7,
+	0x80, 0xde, 0x5b, 0x2c, 0xa0, 0xb3, 0x70, 0x04, 0xcd, 0xc7, 0x46, 0xdd, 0x3d, 0xcb, 0x44, 0x88,
-	0xd1, 0x00, 0xea, 0x0f, 0xb4, 0xba, 0x7b, 0x6e, 0x44, 0x88, 0xd5, 0xc3, 0x27, 0x68, 0x55, 0x35,
+	0xd5, 0xc3, 0xc7, 0x68, 0x45, 0x77, 0x4e, 0xeb, 0x99, 0xb7, 0xac, 0x83, 0x39, 0x30, 0xf0, 0x95,
-	0x52, 0xe3, 0xa9, 0xb7, 0xac, 0x82, 0x39, 0xd4, 0xf0, 0xd5, 0xa3, 0xcc, 0x7c, 0x3b, 0xaa, 0xbc,
+	0xc3, 0xd4, 0x7c, 0x33, 0xa9, 0xbd, 0x7d, 0x57, 0x3d, 0xe5, 0x65, 0x0c, 0xc2, 0x6f, 0xb7, 0x9e,
-	0x7b, 0xd7, 0xcb, 0x10, 0x57, 0x09, 0x70, 0xbf, 0xd9, 0x78, 0x4a, 0x8c, 0x88, 0x4c, 0x8d, 0x8b,
+	0x91, 0x4c, 0x44, 0xa5, 0x26, 0x24, 0xed, 0x83, 0x57, 0x9e, 0x4d, 0xed, 0x54, 0x19, 0x6f, 0xb2,
-	0xb0, 0x0b, 0x5e, 0x71, 0x3a, 0xb5, 0x33, 0x69, 0xbc, 0x35, 0x0f, 0x24, 0x03, 0xe1, 0x03, 0x84,
+	0x0f, 0x92, 0x82, 0xf0, 0x3e, 0x42, 0x1c, 0x7e, 0x4a, 0x40, 0xc8, 0x36, 0x69, 0x79, 0x0f, 0x35,
-	0x18, 0xfc, 0x9c, 0x02, 0x17, 0x4d, 0xd2, 0xf0, 0x56, 0x14, 0x25, 0x2f, 0x1d, 0xc9, 0x3d, 0x64,
+	0x25, 0x2f, 0x1d, 0xc9, 0x3d, 0xa4, 0x80, 0xc2, 0xdb, 0x68, 0x79, 0x0c, 0xbc, 0xe3, 0xad, 0x68,
-	0x02, 0x85, 0x77, 0xd0, 0xf2, 0x10, 0x58, 0xcb, 0x5b, 0x55, 0xe8, 0xfb, 0x1a, 0xbd, 0xfc, 0x0c,
+	0xf4, 0x23, 0x83, 0x5e, 0x7e, 0x0e, 0xbc, 0x43, 0xb4, 0x07, 0x7f, 0x81, 0x96, 0x13, 0x01, 0xdc,
-	0x58, 0x8b, 0x28, 0x0f, 0xfe, 0x1a, 0x2d, 0xa7, 0x1c, 0x98, 0x57, 0x52, 0xb5, 0x7a, 0x6c, 0x6a,
+	0xab, 0xe8, 0x5a, 0xbd, 0x5b, 0xa8, 0x95, 0x3f, 0xdb, 0xdb, 0xaa, 0x46, 0x6d, 0x01, 0xbc, 0xc5,
-	0x95, 0xb5, 0xc5, 0x0f, 0x72, 0x04, 0xec, 0x0c, 0x4d, 0xb6, 0x85, 0x2c, 0x59, 0x93, 0x03, 0x6b,
+	0xce, 0x23, 0xab, 0xa4, 0x2c, 0x44, 0x2b, 0xe0, 0x01, 0xda, 0x0c, 0x47, 0x31, 0x70, 0x11, 0x31,
-	0xd0, 0x8b, 0xd8, 0x0a, 0x4b, 0x0b, 0x51, 0x82, 0xf8, 0x39, 0xda, 0x8a, 0x06, 0x09, 0x30, 0x1e,
+	0xd5, 0x2a, 0xca, 0xe3, 0xb9, 0xf7, 0x52, 0x7d, 0x63, 0x3a, 0xa9, 0x6d, 0xb6, 0xe6, 0x34, 0xc8,
-	0x53, 0xd9, 0x39, 0xd2, 0xe3, 0xb9, 0xff, 0xe7, 0x92, 0xb7, 0xc6, 0xa3, 0xca, 0x56, 0x63, 0x46,
+	0x2d, 0x55, 0xfc, 0x3e, 0x72, 0x45, 0x94, 0xf0, 0x2e, 0xb4, 0x4e, 0x84, 0x87, 0xb6, 0x4b, 0x0d,
-	0x92, 0xcc, 0x5d, 0x82, 0x3f, 0x40, 0x2e, 0x8f, 0x53, 0xd6, 0x86, 0xc6, 0x29, 0xf7, 0xd0, 0x4e,
+	0xb7, 0xb9, 0xa6, 0x7e, 0xb4, 0xd3, 0xcc, 0x48, 0xac, 0x1f, 0x9f, 0x23, 0x37, 0xd2, 0x7d, 0x45,
-	0xa1, 0xe6, 0xd6, 0xd7, 0xe5, 0x2b, 0x3d, 0x33, 0x46, 0x62, 0xfd, 0xf8, 0x02, 0xb9, 0xb1, 0xea,
+	0xe0, 0xdc, 0x5b, 0xd5, 0xf1, 0x7c, 0xe2, 0x2f, 0xba, 0x1a, 0x4c, 0x9b, 0x12, 0x38, 0x07, 0x0e,
-	0x3a, 0x02, 0x17, 0xde, 0x9a, 0x0a, 0xef, 0x63, 0x7f, 0xd1, 0x3d, 0xa2, 0x9b, 0x98, 0xc0, 0x05,
+	0xac, 0x0b, 0xe9, 0x3d, 0xb9, 0x91, 0x58, 0x69, 0x3c, 0x40, 0xeb, 0x1c, 0x44, 0x1c, 0x31, 0x01,
-	0x30, 0xa0, 0x6d, 0xc8, 0xee, 0xc9, 0x8d, 0xc4, 0x4a, 0xe3, 0x1e, 0xda, 0x60, 0xc0, 0x93, 0x98,
+	0xa7, 0x92, 0xca, 0x44, 0x78, 0x8f, 0xf4, 0x65, 0x3b, 0x8b, 0xb5, 0x5f, 0xca, 0x69, 0xe2, 0xe9,
-	0x72, 0x38, 0x13, 0xa1, 0x48, 0xb9, 0x77, 0x5f, 0x5d, 0xb6, 0xbb, 0x58, 0x73, 0x66, 0x9c, 0x3a,
+	0xa4, 0xb6, 0x4e, 0x66, 0x74, 0xc8, 0x9c, 0x2e, 0xa6, 0x68, 0xcd, 0xfc, 0xc4, 0x69, 0x20, 0xde,
-	0x1e, 0x8f, 0x2a, 0x1b, 0x64, 0x4a, 0x87, 0xcc, 0xe8, 0xe2, 0x10, 0xad, 0xeb, 0x06, 0xc8, 0x02,
+	0x9a, 0xbe, 0xa8, 0x71, 0xe7, 0x45, 0x66, 0x05, 0xf8, 0x6d, 0x76, 0xc1, 0xa2, 0x9f, 0x59, 0xf3,
-	0xf1, 0xd6, 0xd5, 0x45, 0xb5, 0x3b, 0x2f, 0xd2, 0xdb, 0xc5, 0x6f, 0xd2, 0x4b, 0x1a, 0x3f, 0xa7,
+	0xf1, 0x74, 0x52, 0x5b, 0x23, 0x45, 0x09, 0x32, 0xab, 0x88, 0x7b, 0x36, 0x19, 0x73, 0xc7, 0xfa,
-	0xf5, 0x07, 0xe3, 0x51, 0x65, 0x9d, 0x4c, 0x4a, 0x90, 0x69, 0x45, 0xdc, 0xb1, 0xc9, 0xe8, 0x3b,
+	0x3d, 0xef, 0x98, 0x49, 0xc4, 0x5c, 0x32, 0xa7, 0x59, 0xff, 0xc3, 0x41, 0xae, 0x5e, 0x23, 0x47,
-	0x36, 0x5e, 0xf3, 0x8e, 0xa9, 0x44, 0xf4, 0x25, 0x33, 0x9a, 0xd5, 0x3f, 0x1c, 0xe4, 0xaa, 0x25,
+	0xa1, 0x90, 0xf8, 0xfb, 0x5b, 0xab, 0xc4, 0x5f, 0xac, 0x74, 0x8a, 0xad, 0x17, 0xc9, 0xa6, 0xe9,
-	0x73, 0x1c, 0x71, 0x81, 0xbf, 0x9f, 0x5b, 0x34, 0xfe, 0x62, 0xa5, 0x93, 0x6c, 0xb5, 0x66, 0xb6,
+	0xca, 0x4a, 0x66, 0x29, 0xac, 0x91, 0x33, 0x54, 0x0e, 0x25, 0x8c, 0x84, 0xf7, 0x60, 0xbb, 0xd4,
-	0x74, 0x93, 0x96, 0x8c, 0x65, 0x62, 0xc9, 0x9c, 0xa3, 0x62, 0x24, 0x60, 0xc0, 0xbd, 0x7b, 0x3b,
+	0x58, 0xdd, 0x0f, 0x16, 0x6f, 0x01, 0x1d, 0x61, 0x73, 0x2d, 0x1b, 0xce, 0x96, 0x52, 0x21, 0xa9,
-	0x85, 0xda, 0xda, 0x41, 0xb0, 0x78, 0x0b, 0xa8, 0x08, 0xeb, 0xeb, 0x66, 0x74, 0x1b, 0x52, 0x85,
+	0x58, 0xbd, 0x83, 0xd6, 0x3f, 0xe7, 0x51, 0x12, 0x13, 0x48, 0x1b, 0x4e, 0xe0, 0x77, 0x50, 0xb9,
-	0x64, 0x62, 0xd5, 0x16, 0xda, 0xf8, 0x9c, 0xc5, 0x69, 0x42, 0x20, 0x6b, 0x38, 0x8e, 0xdf, 0x43,
+	0xaf, 0x2c, 0x3a, 0x05, 0xd7, 0xd2, 0x52, 0x58, 0xea, 0x53, 0x0d, 0xcc, 0x33, 0x86, 0x0e, 0xc8,
-	0xc5, 0xae, 0xb4, 0xa8, 0x14, 0x5c, 0x4b, 0xcb, 0x60, 0x99, 0x4f, 0x36, 0x30, 0x33, 0x0c, 0x15,
+	0x34, 0x70, 0x2e, 0x43, 0xac, 0xbf, 0xfe, 0x6b, 0x09, 0x6d, 0xcc, 0xb5, 0x21, 0xde, 0x41, 0x95,
-	0x90, 0x6e, 0xe0, 0x5c, 0x86, 0x58, 0x7f, 0xf5, 0xd7, 0x02, 0xda, 0x9c, 0x69, 0x43, 0xbc, 0x8b,
+	0x0c, 0x60, 0x2e, 0xca, 0x73, 0xcf, 0x34, 0x48, 0x8e, 0xc0, 0x01, 0x72, 0x19, 0x1d, 0x81, 0x88,
-	0x4a, 0x06, 0xa0, 0x2f, 0xca, 0x73, 0x37, 0x1a, 0x24, 0x47, 0xe0, 0x00, 0xb9, 0x34, 0x1c, 0x00,
+	0x69, 0x17, 0xcc, 0x1a, 0xcd, 0x17, 0xdd, 0x71, 0xe6, 0x20, 0x16, 0xa3, 0xd6, 0x86, 0x3a, 0xe8,
-	0x4f, 0xc2, 0x36, 0xe8, 0x25, 0x9b, 0xaf, 0xc1, 0x13, 0xe3, 0x20, 0x16, 0x23, 0x97, 0x8a, 0x3c,
+	0x05, 0x5a, 0x58, 0x1b, 0x0a, 0x4b, 0xb4, 0x07, 0x37, 0x51, 0x29, 0x09, 0x7b, 0x66, 0x0d, 0xee,
-	0xa8, 0xf5, 0x3a, 0xb1, 0x54, 0x24, 0x96, 0x28, 0x0f, 0xae, 0xa3, 0x42, 0x1a, 0x75, 0xf4, 0x92,
+	0x1a, 0x40, 0xa9, 0xbd, 0xe8, 0x0a, 0x54, 0x64, 0xb5, 0xd0, 0x68, 0x1c, 0x3e, 0x07, 0x2e, 0xc2,
-	0xdc, 0xd3, 0x80, 0x42, 0x73, 0xd1, 0x05, 0x29, 0xc9, 0x72, 0xdd, 0x85, 0x49, 0xf4, 0x0c, 0x18,
+	0x88, 0x99, 0x1d, 0x98, 0x2f, 0xb4, 0xc3, 0x93, 0x96, 0xf1, 0x90, 0x02, 0x0a, 0x1f, 0xa2, 0x8d,
-	0x8f, 0x62, 0xaa, 0x37, 0x64, 0xbe, 0xee, 0x8e, 0x4e, 0x1b, 0xda, 0x43, 0x26, 0x50, 0xf8, 0x08,
+	0x2c, 0xad, 0x8c, 0x98, 0x6e, 0xc2, 0xb7, 0x0c, 0x71, 0x83, 0xcc, 0xba, 0xc9, 0x3c, 0x1e, 0x7f,
-	0x6d, 0x9a, 0xb4, 0x0c, 0x31, 0xdb, 0x93, 0xef, 0x68, 0xe2, 0x26, 0x99, 0x76, 0x93, 0x59, 0x3c,
+	0x84, 0x56, 0x45, 0xd2, 0xc9, 0xcb, 0x97, 0xae, 0xc6, 0x27, 0x86, 0xbe, 0x7a, 0x6a, 0x5d, 0xa4,
-	0x7e, 0x8c, 0xd6, 0x78, 0xda, 0xca, 0xcb, 0x97, 0x2d, 0xce, 0x87, 0x9a, 0xbe, 0x76, 0x66, 0x5d,
+	0x88, 0xab, 0xff, 0xed, 0xa0, 0x87, 0x27, 0xd1, 0x30, 0xec, 0x5e, 0xbe, 0x86, 0x47, 0xef, 0x1b,
-	0x64, 0x12, 0x57, 0xfd, 0xcb, 0x41, 0x2b, 0xa7, 0x71, 0x3f, 0x6a, 0x5f, 0xbd, 0x81, 0x4f, 0xe2,
+	0x54, 0xe6, 0xc9, 0x10, 0xb2, 0x6e, 0x3d, 0x58, 0xbc, 0x5b, 0xd3, 0x10, 0x49, 0x32, 0x04, 0xdb,
-	0x37, 0xa8, 0xc8, 0xd2, 0x3e, 0x98, 0x6e, 0x3d, 0x5c, 0xbc, 0x5b, 0xb3, 0x10, 0x49, 0xda, 0x07,
+	0x7b, 0xea, 0x24, 0x48, 0xaa, 0x58, 0xff, 0xd3, 0x41, 0x28, 0x05, 0xbd, 0x86, 0xa9, 0x6b, 0xcf,
-	0xdb, 0x7b, 0xf2, 0xc4, 0x49, 0xa6, 0x58, 0xfd, 0xd3, 0x41, 0x28, 0x03, 0xbd, 0x81, 0xa9, 0x6b,
+	0x4e, 0xdd, 0xee, 0x7d, 0xf3, 0xb8, 0x63, 0xec, 0x7e, 0x2b, 0x65, 0x39, 0xa8, 0xd4, 0xec, 0x5f,
-	0x4e, 0x4f, 0xdd, 0xde, 0xeb, 0xe6, 0x71, 0xc7, 0xd8, 0xfd, 0x56, 0x30, 0x39, 0xc8, 0xd4, 0xec,
+	0x04, 0x67, 0x91, 0xbf, 0x08, 0x35, 0x54, 0x56, 0xef, 0x55, 0x36, 0x78, 0xae, 0x42, 0xaa, 0x67,
-	0x0f, 0x84, 0xb3, 0xc8, 0x0f, 0x44, 0x05, 0x15, 0xe5, 0xe7, 0xcb, 0x0c, 0x9e, 0x2b, 0x91, 0xf2,
+	0x45, 0x90, 0xd4, 0x8e, 0x7d, 0x84, 0xd4, 0x87, 0x9e, 0x58, 0xe1, 0x95, 0x34, 0x6a, 0x5d, 0xfd,
-	0xb3, 0xc2, 0x49, 0x66, 0xc7, 0x3e, 0x42, 0xf2, 0x41, 0x4d, 0x2c, 0xf7, 0x0a, 0x0a, 0xb5, 0x21,
+	0x54, 0xed, 0xdc, 0x4a, 0x0a, 0x08, 0x25, 0xa8, 0x9e, 0x52, 0xe1, 0x2d, 0x5b, 0x41, 0xf5, 0xc2,
-	0x5f, 0x55, 0x33, 0xb7, 0x92, 0x09, 0x84, 0x14, 0x94, 0x1f, 0x5a, 0xee, 0x2d, 0x5b, 0x41, 0xf9,
+	0x0a, 0x92, 0xda, 0x71, 0x58, 0x1c, 0xf7, 0xb2, 0xae, 0xc4, 0xd3, 0xc5, 0x2b, 0x31, 0xbb, 0x60,
-	0xfd, 0xe5, 0x24, 0xb3, 0xe3, 0x68, 0x72, 0xdc, 0x8b, 0xaa, 0x12, 0x4f, 0x16, 0xaf, 0xc4, 0xf4,
+	0xec, 0xe4, 0xbe, 0x6a, 0x59, 0xa8, 0xd8, 0xf3, 0x31, 0x16, 0xde, 0x43, 0x1b, 0x7b, 0x3e, 0xe7,
-	0x82, 0xb1, 0x93, 0xfb, 0xaa, 0x65, 0x21, 0x63, 0xcf, 0xc7, 0x98, 0x7b, 0x2b, 0x36, 0xf6, 0x7c,
+	0x82, 0x14, 0x10, 0xf8, 0x53, 0xb4, 0xc1, 0x22, 0x96, 0x49, 0xb5, 0xc9, 0x91, 0xf0, 0x56, 0x34,
-	0xce, 0x39, 0x99, 0x40, 0xe0, 0x4f, 0xd1, 0x26, 0x8d, 0xa9, 0x91, 0x6a, 0x92, 0x63, 0xee, 0xad,
+	0xe9, 0x89, 0x9a, 0xa5, 0xe3, 0x59, 0x17, 0x99, 0xc7, 0x36, 0xfd, 0xab, 0xeb, 0xea, 0xd2, 0x8b,
-	0x2a, 0xd2, 0x43, 0x39, 0x4b, 0x27, 0xd3, 0x2e, 0x32, 0x8b, 0xad, 0xfb, 0xd7, 0x37, 0xe5, 0xa5,
+	0xeb, 0xea, 0xd2, 0xcb, 0xeb, 0xea, 0xd2, 0x2f, 0xd3, 0xaa, 0x73, 0x35, 0xad, 0x3a, 0x2f, 0xa6,
-	0x17, 0x37, 0xe5, 0xa5, 0x97, 0x37, 0xe5, 0xa5, 0x5f, 0xc6, 0x65, 0xe7, 0x7a, 0x5c, 0x76, 0x5e,
+	0x55, 0xe7, 0xe5, 0xb4, 0xea, 0xfc, 0x33, 0xad, 0x3a, 0xbf, 0xff, 0x5b, 0x5d, 0xfa, 0xb6, 0x92,
-	0x8c, 0xcb, 0xce, 0xcb, 0x71, 0xd9, 0xf9, 0x7b, 0x5c, 0x76, 0x7e, 0xff, 0xa7, 0xbc, 0xf4, 0x6d,
+	0xe5, 0xf2, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcf, 0xdb, 0xd3, 0xc6, 0xe7, 0x0b, 0x00, 0x00,
-	0xc9, 0xe4, 0xf2, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x34, 0xdf, 0x0c, 0x8f, 0x14, 0x0c, 0x00,
-	0x00,
 }

pkg/apis/audit/v1alpha1/generated.proto

@@ -21,11 +21,11 @@ syntax = 'proto2';
 
 package k8s.io.apiserver.pkg.apis.audit.v1alpha1;
 
+import "k8s.io/api/authentication/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
 import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
-import "k8s.io/client-go/pkg/apis/authentication/v1/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1alpha1";
@@ -56,11 +56,11 @@ message Event {
   optional string verb = 7;
 
   // Authenticated user information.
-  optional k8s.io.client_go.pkg.apis.authentication.v1.UserInfo user = 8;
+  optional k8s.io.api.authentication.v1.UserInfo user = 8;
 
   // Impersonated user information.
   // +optional
-  optional k8s.io.client_go.pkg.apis.authentication.v1.UserInfo impersonatedUser = 9;
+  optional k8s.io.api.authentication.v1.UserInfo impersonatedUser = 9;
 
   // Source IPs, from where the request originated and intermediate proxies.
   // +optional

pkg/apis/audit/v1alpha1/types.generated.go

@@ -25,10 +25,10 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
+	pkg3_v1 "k8s.io/api/authentication/v1"
 	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/api/authentication/v1"
 	"reflect"
 	"runtime"
 	time "time"
@@ -64,10 +64,10 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg1_v1.TypeMeta
+		var v0 pkg3_v1.UserInfo
-		var v1 pkg4_runtime.Unknown
+		var v1 pkg1_v1.TypeMeta
-		var v2 pkg2_types.UID
+		var v2 pkg4_runtime.Unknown
-		var v3 pkg3_v1.UserInfo
+		var v3 pkg2_types.UID
 		var v4 time.Time
 		_, _, _, _, _ = v0, v1, v2, v3, v4
 	}

pkg/apis/audit/v1alpha1/types.go

@@ -17,10 +17,10 @@ limitations under the License.
 package v1alpha1
 
 import (
+	authnv1 "k8s.io/api/authentication/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	authnv1 "k8s.io/api/authentication/v1"
 )
 
 // Header keys used by the audit system.

pkg/audit/BUILD

@@ -23,6 +23,7 @@ go_library(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/pborman/uuid:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
+        "//vendor/k8s.io/api/authentication/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
@@ -33,7 +34,6 @@ go_library(
         "//vendor/k8s.io/apiserver/pkg/apis/audit:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/apis/audit/v1alpha1:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/authentication/v1:go_default_library",
     ],
 )
 

pkg/audit/request.go

@@ -28,6 +28,7 @@ import (
 
 	"reflect"
 
+	authenticationv1 "k8s.io/api/authentication/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -36,7 +37,6 @@ import (
 	"k8s.io/apiserver/pkg/apis/audit"
 	auditinternal "k8s.io/apiserver/pkg/apis/audit"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	authenticationv1 "k8s.io/api/authentication/v1"
 )
 
 func NewEventFromRequest(req *http.Request, level auditinternal.Level, attribs authorizer.Attributes) (*auditinternal.Event, error) {

pkg/endpoints/filters/BUILD

@@ -21,6 +21,8 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
+        "//vendor/k8s.io/api/authentication/v1:go_default_library",
+        "//vendor/k8s.io/api/batch/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/apis/audit:go_default_library",
@@ -31,8 +33,6 @@ go_test(
         "//vendor/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
         "//vendor/k8s.io/apiserver/plugin/pkg/audit/log:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/authentication/v1:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/batch/v1:go_default_library",
     ],
 )
 
@@ -52,6 +52,8 @@ go_library(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/pborman/uuid:go_default_library",
         "//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
+        "//vendor/k8s.io/api/authentication/v1:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
@@ -65,7 +67,5 @@ go_library(
         "//vendor/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/server/httplog:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/authentication/v1:go_default_library",
     ],
 )

pkg/endpoints/filters/authorization_test.go

@@ -23,10 +23,10 @@ import (
 	"reflect"
 	"testing"
 
+	batch "k8s.io/api/batch/v1"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/apiserver/pkg/endpoints/request"
-	batch "k8s.io/api/batch/v1"
 )
 
 func TestGetAuthorizerAttributes(t *testing.T) {

pkg/endpoints/filters/impersonation.go

@@ -24,14 +24,14 @@ import (
 
 	"github.com/golang/glog"
 
+	authenticationv1 "k8s.io/api/authentication/v1"
+	"k8s.io/api/core/v1"
 	"k8s.io/apiserver/pkg/authentication/serviceaccount"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/server/httplog"
-	"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

pkg/endpoints/filters/impersonation_test.go

@@ -25,10 +25,10 @@ import (
 	"sync"
 	"testing"
 
+	authenticationapi "k8s.io/api/authentication/v1"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
 	"k8s.io/apiserver/pkg/endpoints/request"
-	authenticationapi "k8s.io/api/authentication/v1"
 )
 
 type impersonateAuthorizer struct{}

pkg/endpoints/filters/legacy_audit.go

@@ -29,10 +29,10 @@ import (
 	"github.com/golang/glog"
 	"github.com/pborman/uuid"
 
+	authenticationapi "k8s.io/api/authentication/v1"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/apiserver/pkg/endpoints/request"
-	authenticationapi "k8s.io/api/authentication/v1"
 )
 
 var _ http.ResponseWriter = &legacyAuditResponseWriter{}

pkg/registry/generic/rest/BUILD

@@ -21,6 +21,7 @@ go_test(
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/github.com/stretchr/testify/require:go_default_library",
         "//vendor/golang.org/x/net/websocket:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/httpstream:go_default_library",
@@ -28,7 +29,6 @@ go_test(
         "//vendor/k8s.io/apiserver/pkg/features:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/util/proxy:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
     ],
 )
 

pkg/registry/generic/rest/response_checker_test.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 	"testing"
 
-	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 )
 
 func TestGenericHttpResponseChecker(t *testing.T) {

pkg/storage/BUILD

@@ -20,6 +20,7 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
+        "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -33,7 +34,6 @@ go_test(
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
         "//vendor/k8s.io/client-go/tools/cache:go_default_library",
     ],
 )

pkg/storage/cacher_whitebox_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 	"time"
 
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
@@ -29,7 +30,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/api/core/v1"
 )
 
 // verifies the cacheWatcher.process goroutine is properly cleaned up even if

pkg/storage/watch_cache_test.go

@@ -21,6 +21,7 @@ import (
 	"testing"
 	"time"
 
+	"k8s.io/api/core/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,7 +32,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
-	"k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/cache"
 )
 

pkg/util/proxy/BUILD

@@ -18,11 +18,11 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
+        "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
         "//vendor/k8s.io/client-go/listers/core/v1:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
         "//vendor/k8s.io/client-go/tools/cache:go_default_library",
     ],
 )
@@ -40,12 +40,12 @@ go_library(
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/golang.org/x/net/html:go_default_library",
         "//vendor/golang.org/x/net/html/atom:go_default_library",
+        "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//vendor/k8s.io/apimachinery/third_party/forked/golang/netutil:go_default_library",
         "//vendor/k8s.io/client-go/listers/core/v1:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library",
     ],
 )

pkg/util/proxy/proxy.go

@@ -23,9 +23,9 @@ import (
 	"net/url"
 	"strconv"
 
+	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	listersv1 "k8s.io/client-go/listers/core/v1"
-	"k8s.io/api/core/v1"
 
 	"k8s.io/apimachinery/pkg/util/intstr"
 )

pkg/util/proxy/proxy_test.go

@@ -20,10 +20,10 @@ import (
 	"net/url"
 	"testing"
 
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	v1listers "k8s.io/client-go/listers/core/v1"
-	"k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/cache"
 )
 

plugin/pkg/authenticator/token/webhook/BUILD

@@ -17,9 +17,9 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
+        "//vendor/k8s.io/api/authentication/v1beta1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/authentication/user:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/authentication/v1beta1:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd/api/v1:go_default_library",
     ],
 )
@@ -29,6 +29,7 @@ go_library(
     srcs = ["webhook.go"],
     tags = ["automanaged"],
     deps = [
+        "//vendor/k8s.io/api/authentication/v1beta1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/cache:go_default_library",
@@ -37,6 +38,5 @@ go_library(
         "//vendor/k8s.io/apiserver/pkg/util/webhook:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/typed/authentication/v1beta1:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/authentication/v1beta1:go_default_library",
     ],
 )

plugin/pkg/authenticator/token/webhook/webhook.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"time"
 
+	authentication "k8s.io/api/authentication/v1beta1"
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/cache"
@@ -29,7 +30,6 @@ 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/api/authentication/v1beta1"
 )
 
 var (

plugin/pkg/authenticator/token/webhook/webhook_test.go

@@ -30,9 +30,9 @@ import (
 	"testing"
 	"time"
 
+	"k8s.io/api/authentication/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apiserver/pkg/authentication/user"
-	"k8s.io/api/authentication/v1beta1"
 	"k8s.io/client-go/tools/clientcmd/api/v1"
 )
 

plugin/pkg/authorizer/webhook/BUILD

@@ -17,11 +17,11 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
+        "//vendor/k8s.io/api/authorization/v1beta1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/authentication/user:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/authorization/authorizer:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/authorization/v1beta1:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd/api/v1:go_default_library",
     ],
 )
@@ -32,6 +32,7 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/api/authorization/v1beta1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/cache:go_default_library",
@@ -39,6 +40,5 @@ go_library(
         "//vendor/k8s.io/apiserver/pkg/util/webhook:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/typed/authorization/v1beta1:go_default_library",
-        "//vendor/k8s.io/client-go/pkg/apis/authorization/v1beta1:go_default_library",
     ],
 )

plugin/pkg/authorizer/webhook/webhook.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/golang/glog"
 
+	authorization "k8s.io/api/authorization/v1beta1"
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/cache"
@@ -31,7 +32,6 @@ 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/api/authorization/v1beta1"
 )
 
 var (

plugin/pkg/authorizer/webhook/webhook_test.go

@@ -32,11 +32,11 @@ import (
 	"text/template"
 	"time"
 
+	"k8s.io/api/authorization/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/diff"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/authorization/authorizer"
-	"k8s.io/api/authorization/v1beta1"
 	"k8s.io/client-go/tools/clientcmd/api/v1"
 )