From 7a6366bea00fa9061f2ef51c86012d6166cddf61 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 1 Feb 2017 13:49:28 +0100 Subject: [PATCH] Update bazel --- pkg/api/BUILD | 1 - pkg/genericapiserver/endpoints/BUILD | 1 - pkg/genericapiserver/endpoints/filters/BUILD | 6 +++--- pkg/genericapiserver/server/BUILD | 2 +- pkg/storage/storagebackend/factory/BUILD | 7 +++++-- pkg/storage/storagebackend/factory/tls_test.go | 6 +++--- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkg/api/BUILD b/pkg/api/BUILD index d334e8db340..27b3008b026 100644 --- a/pkg/api/BUILD +++ b/pkg/api/BUILD @@ -17,7 +17,6 @@ go_library( "field_constants.go", "helpers.go", "json.go", - "meta.go", "ref.go", "register.go", "resource_helpers.go", diff --git a/pkg/genericapiserver/endpoints/BUILD b/pkg/genericapiserver/endpoints/BUILD index 23221576e07..5710e6e01bf 100644 --- a/pkg/genericapiserver/endpoints/BUILD +++ b/pkg/genericapiserver/endpoints/BUILD @@ -63,7 +63,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/apis/extensions:go_default_library", "//pkg/genericapiserver/endpoints/handlers:go_default_library", "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library", diff --git a/pkg/genericapiserver/endpoints/filters/BUILD b/pkg/genericapiserver/endpoints/filters/BUILD index acb0546f658..2200b1145c9 100644 --- a/pkg/genericapiserver/endpoints/filters/BUILD +++ b/pkg/genericapiserver/endpoints/filters/BUILD @@ -20,7 +20,6 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/apis/authentication:go_default_library", "//pkg/apis/batch:go_default_library", "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", "//vendor:k8s.io/apimachinery/pkg/util/sets", @@ -28,6 +27,7 @@ go_test( "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/endpoints/request", + "//vendor:k8s.io/client-go/pkg/apis/authentication", ], ) @@ -43,8 +43,6 @@ go_library( ], tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", - "//pkg/apis/authentication:go_default_library", "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library", "//vendor:github.com/golang/glog", "//vendor:github.com/pborman/uuid", @@ -56,6 +54,8 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/server/httplog", + "//vendor:k8s.io/client-go/pkg/api", + "//vendor:k8s.io/client-go/pkg/apis/authentication", ], ) diff --git a/pkg/genericapiserver/server/BUILD b/pkg/genericapiserver/server/BUILD index 660e991caed..aaa8b353b54 100644 --- a/pkg/genericapiserver/server/BUILD +++ b/pkg/genericapiserver/server/BUILD @@ -21,7 +21,6 @@ go_test( deps = [ "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", - "//pkg/api/v1:go_default_library", "//pkg/apis/extensions:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/generated/openapi:go_default_library", @@ -35,6 +34,7 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/version", diff --git a/pkg/storage/storagebackend/factory/BUILD b/pkg/storage/storagebackend/factory/BUILD index c397a04dabe..1da0327a2f6 100644 --- a/pkg/storage/storagebackend/factory/BUILD +++ b/pkg/storage/storagebackend/factory/BUILD @@ -35,13 +35,16 @@ go_test( library = ":go_default_library", tags = ["automanaged"], deps = [ - "//pkg/api:go_default_library", - "//pkg/api/testapi:go_default_library", "//pkg/storage/etcd/testing/testingcert:go_default_library", "//vendor:github.com/coreos/etcd/integration", "//vendor:github.com/coreos/etcd/pkg/transport", "//vendor:golang.org/x/net/context", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + "//vendor:k8s.io/client-go/pkg/api", + "//vendor:k8s.io/client-go/pkg/api/v1", ], ) diff --git a/pkg/storage/storagebackend/factory/tls_test.go b/pkg/storage/storagebackend/factory/tls_test.go index 3653b5d6c87..cfa95df3b1c 100644 --- a/pkg/storage/storagebackend/factory/tls_test.go +++ b/pkg/storage/storagebackend/factory/tls_test.go @@ -25,12 +25,12 @@ import ( "golang.org/x/net/context" + "k8s.io/apimachinery/pkg/runtime/schema" + runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apiserver/pkg/storage/storagebackend" clientapi "k8s.io/client-go/pkg/api" clientapiv1 "k8s.io/client-go/pkg/api/v1" "k8s.io/kubernetes/pkg/storage/etcd/testing/testingcert" - runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" - "k8s.io/apimachinery/pkg/runtime/schema" "github.com/coreos/etcd/integration" "github.com/coreos/etcd/pkg/transport" @@ -40,7 +40,7 @@ import ( func TestTLSConnection(t *testing.T) { scheme := runtime.NewScheme() codecs := runtimeserializer.NewCodecFactory(scheme) - codec := codecs.LegacyCodec(schema.GroupVersion{Version:"v1"}) + codec := codecs.LegacyCodec(schema.GroupVersion{Version: "v1"}) // TODO: use k8s.io/apiserver internal type instead of borrowing it from client-go clientapi.AddToScheme(scheme)