From c354076aa41e3cf417b291d5f0eff2b70395ac30 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Wed, 10 May 2017 17:56:53 -0700 Subject: [PATCH 1/4] remove invocation of k8s.io/client-go/pkg/api/install change import of client-go/api/helper to kubernetes/api/helper remove unnecessary use of client-go/api.registry change use of client-go/pkg/util to kubernetes/pkg/util remove dependency on client-go/pkg/apis/extensions remove unnecessary invocation of k8s.io/client-go/extension/intsall change use of k8s.io/client-go/pkg/apis/authentication to v1 --- cmd/kube-proxy/app/server.go | 2 +- pkg/client/tests/fake_client_test.go | 1 - pkg/controller/bootstrap/common_test.go | 2 +- pkg/controller/controller_ref_manager_test.go | 4 ++-- .../podautoscaler/metrics/rest_metrics_client_test.go | 4 ---- staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go | 2 +- .../apiserver/pkg/endpoints/filters/authorization_test.go | 2 +- .../apiserver/pkg/endpoints/filters/impersonation_test.go | 2 +- .../src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go | 3 --- .../src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go | 1 - staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go | 2 -- .../apiserver/plugin/pkg/authorizer/webhook/webhook.go | 2 -- .../pkg/apis/apiextensions/install/install.go | 5 ----- 13 files changed, 7 insertions(+), 25 deletions(-) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index e7af2601b34..4549d07cdf2 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -38,7 +38,6 @@ import ( clientgoclientset "k8s.io/client-go/kubernetes" v1core "k8s.io/client-go/kubernetes/typed/core/v1" clientv1 "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/util" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/tools/record" @@ -55,6 +54,7 @@ import ( "k8s.io/kubernetes/pkg/proxy/iptables" "k8s.io/kubernetes/pkg/proxy/userspace" "k8s.io/kubernetes/pkg/proxy/winuserspace" + "k8s.io/kubernetes/pkg/util" "k8s.io/kubernetes/pkg/util/configz" utildbus "k8s.io/kubernetes/pkg/util/dbus" "k8s.io/kubernetes/pkg/util/exec" diff --git a/pkg/client/tests/fake_client_test.go b/pkg/client/tests/fake_client_test.go index dfcb973852f..25b3dc03de5 100644 --- a/pkg/client/tests/fake_client_test.go +++ b/pkg/client/tests/fake_client_test.go @@ -23,7 +23,6 @@ import ( "k8s.io/kubernetes/pkg/api" clientsetfake "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" - _ "k8s.io/client-go/pkg/api/install" _ "k8s.io/kubernetes/pkg/api/install" ) diff --git a/pkg/controller/bootstrap/common_test.go b/pkg/controller/bootstrap/common_test.go index 4da2a0966e3..5c7b356779b 100644 --- a/pkg/controller/bootstrap/common_test.go +++ b/pkg/controller/bootstrap/common_test.go @@ -22,9 +22,9 @@ import ( "github.com/davecgh/go-spew/spew" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/helper" "k8s.io/client-go/pkg/api/v1" core "k8s.io/client-go/testing" + "k8s.io/kubernetes/pkg/api/helper" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" ) diff --git a/pkg/controller/controller_ref_manager_test.go b/pkg/controller/controller_ref_manager_test.go index 6a3045f83f2..cea1267ade8 100644 --- a/pkg/controller/controller_ref_manager_test.go +++ b/pkg/controller/controller_ref_manager_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/apis/extensions" + "k8s.io/client-go/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/api/v1" ) @@ -37,7 +37,7 @@ var ( ) func newControllerRef(controller metav1.Object) *metav1.OwnerReference { - var controllerKind = extensions.SchemeGroupVersion.WithKind("Fake") + var controllerKind = v1beta1.SchemeGroupVersion.WithKind("Fake") blockOwnerDeletion := true isController := true return &metav1.OwnerReference{ diff --git a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go index 7ded3de6c37..1e39e272455 100644 --- a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go @@ -38,10 +38,6 @@ import ( metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1" "github.com/stretchr/testify/assert" - - // we need the API types for rest mapping lookup - _ "k8s.io/client-go/pkg/api/install" - _ "k8s.io/client-go/pkg/apis/extensions/install" ) type restClientTestCase struct { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go index d84d46e3c7f..9aefc96763a 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/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" + authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1" ) var _ http.ResponseWriter = &auditResponseWriter{} diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go index 58c5876d522..a27577540f3 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go +++ b/staging/src/k8s.io/apiserver/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" - "k8s.io/client-go/pkg/apis/batch" + batch "k8s.io/client-go/pkg/apis/batch/v1" ) func TestGetAuthorizerAttributes(t *testing.T) { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go index d41c7a04027..f2d058252e5 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go @@ -27,7 +27,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" + authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1" ) type impersonateAuthorizer struct{} diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go index 0566e241cec..98ec1da996b 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest_test.go @@ -39,9 +39,6 @@ import ( examplev1 "k8s.io/apiserver/pkg/apis/example/v1" "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/registry/rest" - - // need to register pods - _ "k8s.io/client-go/pkg/api/install" ) var ( diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go index e180e47cd90..213e1e4e72b 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/cacher_test.go @@ -46,7 +46,6 @@ import ( "golang.org/x/net/context" "k8s.io/apimachinery/pkg/runtime/serializer" - _ "k8s.io/client-go/pkg/api/install" ) var ( diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go b/staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go index f1a5d95b809..75691e00a9a 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/utils.go @@ -18,8 +18,6 @@ package tests import ( "k8s.io/apiserver/pkg/apis/example" - - _ "k8s.io/client-go/pkg/api/install" ) func DeepEqualSafePodSpec() example.PodSpec { diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go index ca4916aea55..34f6785727c 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go +++ b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go @@ -32,8 +32,6 @@ import ( "k8s.io/client-go/kubernetes/scheme" authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" authorization "k8s.io/client-go/pkg/apis/authorization/v1beta1" - - _ "k8s.io/client-go/pkg/apis/authorization/install" ) var ( diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go index 64076de91f2..2a1a9697042 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go @@ -21,15 +21,10 @@ import ( "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/client-go/pkg/api" "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" ) -func init() { - Install(api.GroupFactoryRegistry, api.Registry, api.Scheme) -} - // Install registers the API group and adds types to a scheme func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( From b1b5ead8b400d123f0027408c054370c55c01230 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 11 May 2017 15:17:25 -0700 Subject: [PATCH 2/4] update visibility manually --- staging/src/k8s.io/client-go/pkg/api/helper/BUILD | 4 +--- staging/src/k8s.io/client-go/pkg/api/install/BUILD | 8 +------- staging/src/k8s.io/client-go/pkg/apis/extensions/BUILD | 4 ++++ .../k8s.io/client-go/pkg/apis/extensions/install/BUILD | 1 + staging/src/k8s.io/client-go/pkg/util/BUILD | 3 +++ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/staging/src/k8s.io/client-go/pkg/api/helper/BUILD b/staging/src/k8s.io/client-go/pkg/api/helper/BUILD index 5fc91cc4102..0fd3da5a50f 100644 --- a/staging/src/k8s.io/client-go/pkg/api/helper/BUILD +++ b/staging/src/k8s.io/client-go/pkg/api/helper/BUILD @@ -12,9 +12,7 @@ go_library( name = "go_default_library", srcs = ["helpers.go"], tags = ["automanaged"], - visibility = [ - "//pkg/controller/bootstrap:__subpackages__", - ], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/api/install/BUILD b/staging/src/k8s.io/client-go/pkg/api/install/BUILD index 9d7ef394143..6004f22ae8a 100644 --- a/staging/src/k8s.io/client-go/pkg/api/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/api/install/BUILD @@ -11,13 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], - visibility = [ - "//pkg/client/tests:__subpackages__", - "//pkg/controller/podautoscaler/metrics:__subpackages__", - "//vendor/k8s.io/apiserver/pkg/endpoints/handlers:__subpackages__", - "//vendor/k8s.io/apiserver/pkg/storage/tests:__subpackages__", - "//vendor/k8s.io/client-go/kubernetes/fake:__subpackages__", - ], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/BUILD b/staging/src/k8s.io/client-go/pkg/apis/extensions/BUILD index 529181ac240..e64293306e4 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/BUILD @@ -17,6 +17,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/extensions/install/BUILD index bc197170be3..edc6657600e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/util/BUILD b/staging/src/k8s.io/client-go/pkg/util/BUILD index ff028a804fe..fbf326b6bbd 100644 --- a/staging/src/k8s.io/client-go/pkg/util/BUILD +++ b/staging/src/k8s.io/client-go/pkg/util/BUILD @@ -16,4 +16,7 @@ go_library( "util.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + ], ) From b91f787d8368ae5499a2f25009f5acf17918ebf5 Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 11 May 2017 15:40:40 -0700 Subject: [PATCH 3/4] run visibility-control.sh to setup visibility for all internal versions of client-go api groups, and their install packages --- staging/src/k8s.io/client-go/pkg/apis/apps/BUILD | 4 ++++ staging/src/k8s.io/client-go/pkg/apis/apps/install/BUILD | 1 + staging/src/k8s.io/client-go/pkg/apis/authentication/BUILD | 4 ++++ .../k8s.io/client-go/pkg/apis/authentication/install/BUILD | 1 + staging/src/k8s.io/client-go/pkg/apis/authorization/BUILD | 4 ++++ .../src/k8s.io/client-go/pkg/apis/authorization/install/BUILD | 1 + staging/src/k8s.io/client-go/pkg/apis/autoscaling/BUILD | 4 ++++ .../src/k8s.io/client-go/pkg/apis/autoscaling/install/BUILD | 1 + staging/src/k8s.io/client-go/pkg/apis/batch/BUILD | 4 ++++ staging/src/k8s.io/client-go/pkg/apis/batch/install/BUILD | 1 + staging/src/k8s.io/client-go/pkg/apis/certificates/BUILD | 4 ++++ .../src/k8s.io/client-go/pkg/apis/certificates/install/BUILD | 1 + staging/src/k8s.io/client-go/pkg/apis/policy/BUILD | 4 ++++ staging/src/k8s.io/client-go/pkg/apis/policy/install/BUILD | 1 + staging/src/k8s.io/client-go/pkg/apis/rbac/BUILD | 4 ++++ staging/src/k8s.io/client-go/pkg/apis/rbac/install/BUILD | 1 + staging/src/k8s.io/client-go/pkg/apis/settings/BUILD | 4 ++++ staging/src/k8s.io/client-go/pkg/apis/settings/install/BUILD | 1 + staging/src/k8s.io/client-go/pkg/apis/storage/BUILD | 4 ++++ staging/src/k8s.io/client-go/pkg/apis/storage/install/BUILD | 1 + 20 files changed, 50 insertions(+) diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/BUILD b/staging/src/k8s.io/client-go/pkg/apis/apps/BUILD index 0e23b5a0e61..6a06bd1a894 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/BUILD @@ -16,6 +16,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/apps/install/BUILD index 8cc38c50622..06a5ccfa79b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/BUILD b/staging/src/k8s.io/client-go/pkg/apis/authentication/BUILD index 6e2604388ad..c6619824914 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/BUILD @@ -16,6 +16,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/authentication/install/BUILD index 359bb31b98b..a06cbfb8369 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/BUILD b/staging/src/k8s.io/client-go/pkg/apis/authorization/BUILD index 6e2604388ad..c6619824914 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/BUILD @@ -16,6 +16,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/authorization/install/BUILD index e56e44fb458..61e7d8fc099 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/BUILD b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/BUILD index f2d4141e705..7587ba8d792 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/BUILD @@ -17,6 +17,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/install/BUILD index eb0f54888fd..600c33347e9 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/BUILD b/staging/src/k8s.io/client-go/pkg/apis/batch/BUILD index f0ff3f2ce1f..b896f3531ff 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/BUILD @@ -16,6 +16,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/batch/install/BUILD index 0902b80710a..8e73fd8896d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/BUILD b/staging/src/k8s.io/client-go/pkg/apis/certificates/BUILD index 0e128d1a316..ce702b72221 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/BUILD @@ -17,6 +17,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/certificates/install/BUILD index 97eb19640a8..d228bd90e6c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/BUILD b/staging/src/k8s.io/client-go/pkg/apis/policy/BUILD index 3fce625945b..2650813d5fd 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/BUILD @@ -16,6 +16,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/policy/install/BUILD index 5cb7b9bebcb..287bf66e5bd 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/BUILD b/staging/src/k8s.io/client-go/pkg/apis/rbac/BUILD index 2825eb324bf..1da25cf5a62 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/BUILD @@ -17,6 +17,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/rbac/install/BUILD index 97d0df56542..bb5aa3b730d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/settings/BUILD b/staging/src/k8s.io/client-go/pkg/apis/settings/BUILD index f0ff3f2ce1f..b896f3531ff 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/settings/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/settings/BUILD @@ -16,6 +16,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/settings/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/settings/install/BUILD index 9289ee74d93..f23b5047e21 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/settings/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/settings/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/BUILD b/staging/src/k8s.io/client-go/pkg/apis/storage/BUILD index 6e2604388ad..c6619824914 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/BUILD @@ -16,6 +16,10 @@ go_library( "zz_generated.deepcopy.go", ], tags = ["automanaged"], + visibility = [ + "//vendor/k8s.io/client-go/pkg/api/v1:__pkg__", + "//vendor/k8s.io/client-go/pkg/apis:__subpackages__", + ], deps = [ "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library", diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/install/BUILD b/staging/src/k8s.io/client-go/pkg/apis/storage/install/BUILD index 2d986355505..c99ddaaddef 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/install/BUILD +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/install/BUILD @@ -11,6 +11,7 @@ go_library( name = "go_default_library", srcs = ["install.go"], tags = ["automanaged"], + visibility = ["//visibility:private"], deps = [ "//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", From 14045d253d11c801ad94f0928cb9b13a224ee18f Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Thu, 11 May 2017 15:59:04 -0700 Subject: [PATCH 4/4] hack/update-bazel.sh --- cmd/kube-proxy/app/BUILD | 2 +- pkg/client/tests/BUILD | 1 - pkg/controller/BUILD | 2 +- pkg/controller/bootstrap/BUILD | 2 +- pkg/controller/podautoscaler/metrics/BUILD | 2 -- staging/src/k8s.io/apiserver/pkg/endpoints/filters/BUILD | 5 ++--- staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD | 1 - staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD | 6 +----- .../k8s.io/apiserver/plugin/pkg/authorizer/webhook/BUILD | 1 - .../pkg/apis/apiextensions/install/BUILD | 1 - 10 files changed, 6 insertions(+), 17 deletions(-) diff --git a/cmd/kube-proxy/app/BUILD b/cmd/kube-proxy/app/BUILD index 2b613b79d12..6272d270da2 100644 --- a/cmd/kube-proxy/app/BUILD +++ b/cmd/kube-proxy/app/BUILD @@ -29,6 +29,7 @@ go_library( "//pkg/proxy/iptables:go_default_library", "//pkg/proxy/userspace:go_default_library", "//pkg/proxy/winuserspace:go_default_library", + "//pkg/util:go_default_library", "//pkg/util/configz:go_default_library", "//pkg/util/dbus:go_default_library", "//pkg/util/exec:go_default_library", @@ -52,7 +53,6 @@ go_library( "//vendor/k8s.io/client-go/kubernetes:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", - "//vendor/k8s.io/client-go/pkg/util:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library", "//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library", "//vendor/k8s.io/client-go/tools/record:go_default_library", diff --git a/pkg/client/tests/BUILD b/pkg/client/tests/BUILD index 790147ffe97..c94feb489b9 100644 --- a/pkg/client/tests/BUILD +++ b/pkg/client/tests/BUILD @@ -37,7 +37,6 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/httpstream:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/remotecommand:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", - "//vendor/k8s.io/client-go/pkg/api/install:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/tools/portforward:go_default_library", diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD index 55f57ed8fc7..733f0d1311f 100644 --- a/pkg/controller/BUILD +++ b/pkg/controller/BUILD @@ -82,7 +82,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/extensions:go_default_library", + "//vendor/k8s.io/client-go/pkg/apis/extensions/v1beta1:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", "//vendor/k8s.io/client-go/tools/record:go_default_library", diff --git a/pkg/controller/bootstrap/BUILD b/pkg/controller/bootstrap/BUILD index 1e7ee03896b..331e470ae2d 100644 --- a/pkg/controller/bootstrap/BUILD +++ b/pkg/controller/bootstrap/BUILD @@ -21,13 +21,13 @@ go_test( tags = ["automanaged"], deps = [ "//pkg/api:go_default_library", + "//pkg/api/helper:go_default_library", "//pkg/bootstrap/api:go_default_library", "//vendor/github.com/davecgh/go-spew/spew:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library", - "//vendor/k8s.io/client-go/pkg/api/helper:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library", ], diff --git a/pkg/controller/podautoscaler/metrics/BUILD b/pkg/controller/podautoscaler/metrics/BUILD index d7b8dc4e911..94c622fa686 100644 --- a/pkg/controller/podautoscaler/metrics/BUILD +++ b/pkg/controller/podautoscaler/metrics/BUILD @@ -55,9 +55,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/labels: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/client-go/pkg/api/install:go_default_library", "//vendor/k8s.io/client-go/pkg/api/v1:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/extensions/install:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library", "//vendor/k8s.io/heapster/metrics/api/v1/types:go_default_library", diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/BUILD b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/BUILD index 5c1d996cfd4..b0874e5e198 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/BUILD @@ -26,8 +26,8 @@ go_test( "//vendor/k8s.io/apiserver/pkg/authorization/authorizer:go_default_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/client-go/pkg/apis/authentication:go_default_library", - "//vendor/k8s.io/client-go/pkg/apis/batch: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", ], ) @@ -55,7 +55,6 @@ go_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:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/authentication/v1:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD index df1a0ee5e2b..2f53997abae 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD @@ -28,7 +28,6 @@ go_test( "//vendor/k8s.io/apiserver/pkg/apis/example/v1:go_default_library", "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library", "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library", - "//vendor/k8s.io/client-go/pkg/api/install:go_default_library", ], ) diff --git a/staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD b/staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD index b260f65157c..eede87f675b 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD +++ b/staging/src/k8s.io/apiserver/pkg/storage/tests/BUILD @@ -34,7 +34,6 @@ go_test( "//vendor/k8s.io/apiserver/pkg/storage/etcd/etcdtest:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd/testing:go_default_library", "//vendor/k8s.io/apiserver/pkg/storage/etcd3:go_default_library", - "//vendor/k8s.io/client-go/pkg/api/install:go_default_library", ], ) @@ -42,8 +41,5 @@ go_library( name = "go_default_library", srcs = ["utils.go"], tags = ["automanaged"], - deps = [ - "//vendor/k8s.io/apiserver/pkg/apis/example:go_default_library", - "//vendor/k8s.io/client-go/pkg/api/install:go_default_library", - ], + deps = ["//vendor/k8s.io/apiserver/pkg/apis/example:go_default_library"], ) diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/BUILD b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/BUILD index b38a3dcbbe6..ab993321cee 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/BUILD +++ b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/BUILD @@ -39,7 +39,6 @@ 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/install:go_default_library", "//vendor/k8s.io/client-go/pkg/apis/authorization/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD index b24d226dc9d..a13b2b1dd6e 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD @@ -29,7 +29,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", - "//vendor/k8s.io/client-go/pkg/api:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", ],