From 0e9c1f75bfa1fbd3eb4bb7ed6a85adc34b5579a7 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Sat, 11 Feb 2017 12:30:09 +0100 Subject: [PATCH] Update bazel --- cmd/kube-apiserver/app/BUILD | 1 + cmd/kube-apiserver/app/options/BUILD | 1 + examples/apiserver/BUILD | 1 + federation/cmd/federation-apiserver/app/BUILD | 1 + .../federation-apiserver/app/options/BUILD | 1 + pkg/kubeapiserver/BUILD | 7 +-- pkg/master/BUILD | 4 +- pkg/master/thirdparty/BUILD | 1 + pkg/registry/apps/rest/BUILD | 1 + pkg/registry/authentication/rest/BUILD | 1 + pkg/registry/authorization/rest/BUILD | 1 + pkg/registry/autoscaling/rest/BUILD | 1 + pkg/registry/batch/rest/BUILD | 1 + pkg/registry/certificates/rest/BUILD | 1 + pkg/registry/core/rest/BUILD | 1 + pkg/registry/extensions/rest/BUILD | 1 + pkg/registry/policy/rest/BUILD | 1 + pkg/registry/rbac/rest/BUILD | 1 + pkg/registry/storage/rest/BUILD | 1 + test/integration/framework/BUILD | 3 +- vendor/BUILD | 59 ++++++++++++++----- 21 files changed, 69 insertions(+), 21 deletions(-) diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD index 119d838482..d8c7a47cf0 100644 --- a/cmd/kube-apiserver/app/BUILD +++ b/cmd/kube-apiserver/app/BUILD @@ -64,6 +64,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/admission", "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/filters", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/cmd/kube-apiserver/app/options/BUILD b/cmd/kube-apiserver/app/options/BUILD index 24230507c5..55681fb6c6 100644 --- a/cmd/kube-apiserver/app/options/BUILD +++ b/cmd/kube-apiserver/app/options/BUILD @@ -25,6 +25,7 @@ go_library( "//vendor:github.com/spf13/pflag", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apiserver/pkg/server/options", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) diff --git a/examples/apiserver/BUILD b/examples/apiserver/BUILD index cab1c03161..dbd8880d3a 100644 --- a/examples/apiserver/BUILD +++ b/examples/apiserver/BUILD @@ -25,6 +25,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/options", + "//vendor:k8s.io/apiserver/pkg/server/storage", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) diff --git a/federation/cmd/federation-apiserver/app/BUILD b/federation/cmd/federation-apiserver/app/BUILD index 976843ac18..5f3170fe18 100644 --- a/federation/cmd/federation-apiserver/app/BUILD +++ b/federation/cmd/federation-apiserver/app/BUILD @@ -73,6 +73,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/filters", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/federation/cmd/federation-apiserver/app/options/BUILD b/federation/cmd/federation-apiserver/app/options/BUILD index 9a04bfec7c..99f7000e56 100644 --- a/federation/cmd/federation-apiserver/app/options/BUILD +++ b/federation/cmd/federation-apiserver/app/options/BUILD @@ -20,6 +20,7 @@ go_library( "//pkg/kubeapiserver/options:go_default_library", "//vendor:github.com/spf13/pflag", "//vendor:k8s.io/apiserver/pkg/server/options", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) diff --git a/pkg/kubeapiserver/BUILD b/pkg/kubeapiserver/BUILD index f47d431619..064b1cc64b 100644 --- a/pkg/kubeapiserver/BUILD +++ b/pkg/kubeapiserver/BUILD @@ -13,16 +13,13 @@ go_library( srcs = [ "default_storage_factory_builder.go", "doc.go", - "rest.go", ], tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apiserver/pkg/registry/generic", - "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", - "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/apiserver/pkg/util/flag", ], @@ -59,6 +56,6 @@ go_test( "//pkg/apis/extensions/install:go_default_library", "//pkg/apis/extensions/v1beta1:go_default_library", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", - "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/pkg/master/BUILD b/pkg/master/BUILD index 5f542f0fc6..ecc134ffca 100644 --- a/pkg/master/BUILD +++ b/pkg/master/BUILD @@ -83,6 +83,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/server", "//vendor:k8s.io/apiserver/pkg/server/healthz", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) @@ -114,7 +115,6 @@ go_test( "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/clientset_generated/internalclientset/fake:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/kubeapiserver:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/version:go_default_library", "//vendor:github.com/go-openapi/loads", @@ -131,6 +131,8 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/version", "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/options", + "//vendor:k8s.io/apiserver/pkg/server/storage", "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/testing", diff --git a/pkg/master/thirdparty/BUILD b/pkg/master/thirdparty/BUILD index aa6e84604b..fbcc4ce05d 100644 --- a/pkg/master/thirdparty/BUILD +++ b/pkg/master/thirdparty/BUILD @@ -28,6 +28,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", ], ) diff --git a/pkg/registry/apps/rest/BUILD b/pkg/registry/apps/rest/BUILD index 60e855bbf0..0a9762690e 100644 --- a/pkg/registry/apps/rest/BUILD +++ b/pkg/registry/apps/rest/BUILD @@ -19,6 +19,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/pkg/registry/authentication/rest/BUILD b/pkg/registry/authentication/rest/BUILD index d2e866d14c..ef6536be66 100644 --- a/pkg/registry/authentication/rest/BUILD +++ b/pkg/registry/authentication/rest/BUILD @@ -21,6 +21,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/pkg/registry/authorization/rest/BUILD b/pkg/registry/authorization/rest/BUILD index 17c94a3eb8..89ad641309 100644 --- a/pkg/registry/authorization/rest/BUILD +++ b/pkg/registry/authorization/rest/BUILD @@ -23,6 +23,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/pkg/registry/autoscaling/rest/BUILD b/pkg/registry/autoscaling/rest/BUILD index 6e3bc586b5..6e189aeaa7 100644 --- a/pkg/registry/autoscaling/rest/BUILD +++ b/pkg/registry/autoscaling/rest/BUILD @@ -20,6 +20,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/pkg/registry/batch/rest/BUILD b/pkg/registry/batch/rest/BUILD index 5c361e528e..3cb35928e5 100644 --- a/pkg/registry/batch/rest/BUILD +++ b/pkg/registry/batch/rest/BUILD @@ -22,6 +22,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/pkg/registry/certificates/rest/BUILD b/pkg/registry/certificates/rest/BUILD index 2b8817e2ea..2723928101 100644 --- a/pkg/registry/certificates/rest/BUILD +++ b/pkg/registry/certificates/rest/BUILD @@ -19,6 +19,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD index 86ef57ac91..6ef295553e 100644 --- a/pkg/registry/core/rest/BUILD +++ b/pkg/registry/core/rest/BUILD @@ -57,6 +57,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", "//vendor:k8s.io/apiserver/pkg/storage/etcd/util", "//vendor:k8s.io/client-go/rest", ], diff --git a/pkg/registry/extensions/rest/BUILD b/pkg/registry/extensions/rest/BUILD index 7741b04f43..479e572e80 100644 --- a/pkg/registry/extensions/rest/BUILD +++ b/pkg/registry/extensions/rest/BUILD @@ -51,6 +51,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/pkg/registry/policy/rest/BUILD b/pkg/registry/policy/rest/BUILD index 1d9b7939c0..3d3128d5b3 100644 --- a/pkg/registry/policy/rest/BUILD +++ b/pkg/registry/policy/rest/BUILD @@ -19,6 +19,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/pkg/registry/rbac/rest/BUILD b/pkg/registry/rbac/rest/BUILD index 0a79675bb4..198b891031 100644 --- a/pkg/registry/rbac/rest/BUILD +++ b/pkg/registry/rbac/rest/BUILD @@ -41,6 +41,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/pkg/registry/storage/rest/BUILD b/pkg/registry/storage/rest/BUILD index 3ee0ba966f..d5fc84b07f 100644 --- a/pkg/registry/storage/rest/BUILD +++ b/pkg/registry/storage/rest/BUILD @@ -19,6 +19,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", ], ) diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index ca7de5fa8c..0b29120df9 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -34,7 +34,6 @@ go_library( "//pkg/controller:go_default_library", "//pkg/controller/replication:go_default_library", "//pkg/generated/openapi:go_default_library", - "//pkg/kubeapiserver:go_default_library", "//pkg/kubectl:go_default_library", "//pkg/kubelet/client:go_default_library", "//pkg/master:go_default_library", @@ -61,6 +60,8 @@ go_library( "//vendor:k8s.io/apiserver/pkg/authorization/authorizerfactory", "//vendor:k8s.io/apiserver/pkg/authorization/union", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/options", + "//vendor:k8s.io/apiserver/pkg/server/storage", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/tools/record", diff --git a/vendor/BUILD b/vendor/BUILD index 87a3b14870..14fd079407 100644 --- a/vendor/BUILD +++ b/vendor/BUILD @@ -9061,10 +9061,7 @@ go_library( "k8s.io/apiserver/pkg/server/genericapiserver.go", "k8s.io/apiserver/pkg/server/healthz.go", "k8s.io/apiserver/pkg/server/hooks.go", - "k8s.io/apiserver/pkg/server/resource_config.go", - "k8s.io/apiserver/pkg/server/resource_encoding_config.go", "k8s.io/apiserver/pkg/server/serve.go", - "k8s.io/apiserver/pkg/server/storage_factory.go", ], tags = ["automanaged"], deps = [ @@ -9082,7 +9079,6 @@ go_library( "//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/runtime/serializer/recognizer", "//vendor:k8s.io/apimachinery/pkg/util/net", "//vendor:k8s.io/apimachinery/pkg/util/runtime", "//vendor:k8s.io/apimachinery/pkg/util/sets", @@ -9107,7 +9103,6 @@ go_library( "//vendor:k8s.io/apiserver/pkg/server/healthz", "//vendor:k8s.io/apiserver/pkg/server/mux", "//vendor:k8s.io/apiserver/pkg/server/routes", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/client-go/rest", "//vendor:k8s.io/client-go/util/cert", ], @@ -14145,6 +14140,7 @@ go_library( "//vendor:k8s.io/apiserver/pkg/registry/generic", "//vendor:k8s.io/apiserver/pkg/registry/generic/registry", "//vendor:k8s.io/apiserver/pkg/server", + "//vendor:k8s.io/apiserver/pkg/server/storage", "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/apiserver/pkg/util/feature", "//vendor:k8s.io/apiserver/pkg/util/flag", @@ -14808,11 +14804,7 @@ go_library( go_test( name = "k8s.io/apiserver/pkg/server_test", - srcs = [ - "k8s.io/apiserver/pkg/server/genericapiserver_test.go", - "k8s.io/apiserver/pkg/server/resource_config_test.go", - "k8s.io/apiserver/pkg/server/storage_factory_test.go", - ], + srcs = ["k8s.io/apiserver/pkg/server/genericapiserver_test.go"], library = ":k8s.io/apiserver/pkg/server", tags = ["automanaged"], deps = [ @@ -14821,8 +14813,6 @@ go_test( "//vendor:github.com/stretchr/testify/assert", "//vendor:k8s.io/apimachinery/pkg/api/meta", "//vendor:k8s.io/apimachinery/pkg/apimachinery", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", - "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1", "//vendor:k8s.io/apimachinery/pkg/runtime", "//vendor:k8s.io/apimachinery/pkg/runtime/schema", @@ -14831,14 +14821,12 @@ go_test( "//vendor:k8s.io/apimachinery/pkg/util/sets", "//vendor:k8s.io/apimachinery/pkg/version", "//vendor:k8s.io/apiserver/pkg/apis/example", - "//vendor:k8s.io/apiserver/pkg/apis/example/install", "//vendor:k8s.io/apiserver/pkg/apis/example/v1", "//vendor:k8s.io/apiserver/pkg/authentication/user", "//vendor:k8s.io/apiserver/pkg/authorization/authorizer", "//vendor:k8s.io/apiserver/pkg/endpoints/request", "//vendor:k8s.io/apiserver/pkg/registry/rest", "//vendor:k8s.io/apiserver/pkg/storage/etcd/testing", - "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", "//vendor:k8s.io/client-go/pkg/api", "//vendor:k8s.io/client-go/rest", ], @@ -16847,3 +16835,46 @@ go_library( "//vendor:k8s.io/kube-aggregator/pkg/registry/apiservice", ], ) + +go_test( + name = "k8s.io/apiserver/pkg/server/storage_test", + srcs = [ + "k8s.io/apiserver/pkg/server/storage/resource_config_test.go", + "k8s.io/apiserver/pkg/server/storage/storage_factory_test.go", + ], + library = ":k8s.io/apiserver/pkg/server/storage", + tags = ["automanaged"], + deps = [ + "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//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/apiserver/pkg/apis/example", + "//vendor:k8s.io/apiserver/pkg/apis/example/install", + "//vendor:k8s.io/apiserver/pkg/apis/example/v1", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + ], +) + +go_library( + name = "k8s.io/apiserver/pkg/server/storage", + srcs = [ + "k8s.io/apiserver/pkg/server/storage/doc.go", + "k8s.io/apiserver/pkg/server/storage/resource_config.go", + "k8s.io/apiserver/pkg/server/storage/resource_encoding_config.go", + "k8s.io/apiserver/pkg/server/storage/storage_codec.go", + "k8s.io/apiserver/pkg/server/storage/storage_factory.go", + ], + tags = ["automanaged"], + deps = [ + "//vendor:github.com/golang/glog", + "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered", + "//vendor:k8s.io/apimachinery/pkg/runtime", + "//vendor:k8s.io/apimachinery/pkg/runtime/schema", + "//vendor:k8s.io/apimachinery/pkg/runtime/serializer/recognizer", + "//vendor:k8s.io/apimachinery/pkg/util/sets", + "//vendor:k8s.io/apiserver/pkg/storage/storagebackend", + ], +)