diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index d91585fcdb6..cfa8a284eea 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -1,29 +1,4 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_test( - name = "go_default_test", - srcs = [ - "server_bootstrap_test.go", - "server_test.go", - ], - embed = [":go_default_library"], - deps = [ - "//pkg/apis/certificates/v1beta1:go_default_library", - "//pkg/controller/certificates/authority:go_default_library", - "//staging/src/k8s.io/api/certificates/v1beta1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", - "//staging/src/k8s.io/client-go/rest:go_default_library", - "//staging/src/k8s.io/client-go/util/cert:go_default_library", - ], -) +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", @@ -38,6 +13,7 @@ go_library( "server_unsupported.go", ], importpath = "k8s.io/kubernetes/cmd/kubelet/app", + visibility = ["//visibility:public"], deps = [ "//cmd/kubelet/app/options:go_default_library", "//pkg/api/legacyscheme:go_default_library", @@ -162,6 +138,25 @@ go_library( }), ) +go_test( + name = "go_default_test", + srcs = [ + "server_bootstrap_test.go", + "server_test.go", + ], + embed = [":go_default_library"], + deps = [ + "//pkg/apis/certificates/v1beta1:go_default_library", + "//pkg/controller/certificates/authority:go_default_library", + "//staging/src/k8s.io/api/certificates/v1beta1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", + "//staging/src/k8s.io/client-go/rest:go_default_library", + "//staging/src/k8s.io/client-go/util/cert:go_default_library", + ], +) + filegroup( name = "package-srcs", srcs = glob(["**"]), @@ -176,4 +171,5 @@ filegroup( "//cmd/kubelet/app/options:all-srcs", ], tags = ["automanaged"], + visibility = ["//visibility:public"], ) diff --git a/cmd/kubemark/BUILD b/cmd/kubemark/BUILD index 0131d40a495..1b84cf38f25 100644 --- a/cmd/kubemark/BUILD +++ b/cmd/kubemark/BUILD @@ -19,8 +19,8 @@ go_library( "//pkg/api/legacyscheme:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/cm:go_default_library", - "//pkg/kubelet/remote:go_default_library", - "//pkg/kubelet/remote/fake:go_default_library", + "//pkg/kubelet/cri/remote:go_default_library", + "//pkg/kubelet/cri/remote/fake:go_default_library", "//pkg/kubemark:go_default_library", "//pkg/master/ports:go_default_library", "//pkg/util/iptables/testing:go_default_library", diff --git a/pkg/client/tests/BUILD b/pkg/client/tests/BUILD index 1d997a32e0f..9608af1da5d 100644 --- a/pkg/client/tests/BUILD +++ b/pkg/client/tests/BUILD @@ -19,8 +19,8 @@ go_test( "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/apis/core/install:go_default_library", - "//pkg/kubelet/server/portforward:go_default_library", - "//pkg/kubelet/server/remotecommand:go_default_library", + "//pkg/kubelet/cri/streaming/portforward:go_default_library", + "//pkg/kubelet/cri/streaming/remotecommand:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library", diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 545932d9ca8..e8d61bdbe0c 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -53,6 +53,10 @@ go_library( "//pkg/kubelet/config:go_default_library", "//pkg/kubelet/configmap:go_default_library", "//pkg/kubelet/container:go_default_library", + "//pkg/kubelet/cri/remote:go_default_library", + "//pkg/kubelet/cri/streaming:go_default_library", + "//pkg/kubelet/cri/streaming/portforward:go_default_library", + "//pkg/kubelet/cri/streaming/remotecommand:go_default_library", "//pkg/kubelet/dockershim:go_default_library", "//pkg/kubelet/dockershim/remote:go_default_library", "//pkg/kubelet/envvars:go_default_library", @@ -77,15 +81,11 @@ go_library( "//pkg/kubelet/preemption:go_default_library", "//pkg/kubelet/prober:go_default_library", "//pkg/kubelet/prober/results:go_default_library", - "//pkg/kubelet/remote:go_default_library", "//pkg/kubelet/runtimeclass:go_default_library", "//pkg/kubelet/secret:go_default_library", "//pkg/kubelet/server:go_default_library", "//pkg/kubelet/server/metrics:go_default_library", - "//pkg/kubelet/server/portforward:go_default_library", - "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/kubelet/server/stats:go_default_library", - "//pkg/kubelet/server/streaming:go_default_library", "//pkg/kubelet/stats:go_default_library", "//pkg/kubelet/status:go_default_library", "//pkg/kubelet/sysctl:go_default_library", @@ -189,6 +189,8 @@ go_test( "//pkg/kubelet/configmap:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", + "//pkg/kubelet/cri/streaming/portforward:go_default_library", + "//pkg/kubelet/cri/streaming/remotecommand:go_default_library", "//pkg/kubelet/eviction:go_default_library", "//pkg/kubelet/images:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", @@ -202,8 +204,6 @@ go_test( "//pkg/kubelet/prober/results:go_default_library", "//pkg/kubelet/prober/testing:go_default_library", "//pkg/kubelet/secret:go_default_library", - "//pkg/kubelet/server/portforward:go_default_library", - "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/kubelet/server/stats:go_default_library", "//pkg/kubelet/stats:go_default_library", "//pkg/kubelet/status:go_default_library", @@ -281,6 +281,8 @@ filegroup( "//pkg/kubelet/config:all-srcs", "//pkg/kubelet/configmap:all-srcs", "//pkg/kubelet/container:all-srcs", + "//pkg/kubelet/cri/remote:all-srcs", + "//pkg/kubelet/cri/streaming:all-srcs", "//pkg/kubelet/custommetrics:all-srcs", "//pkg/kubelet/dockershim:all-srcs", "//pkg/kubelet/envvars:all-srcs", @@ -304,7 +306,6 @@ filegroup( "//pkg/kubelet/preemption:all-srcs", "//pkg/kubelet/prober:all-srcs", "//pkg/kubelet/qos:all-srcs", - "//pkg/kubelet/remote:all-srcs", "//pkg/kubelet/runtimeclass:all-srcs", "//pkg/kubelet/secret:all-srcs", "//pkg/kubelet/server:all-srcs", diff --git a/pkg/kubelet/cri/remote/BUILD b/pkg/kubelet/cri/remote/BUILD index c6bd9d74b86..44d99d23a36 100644 --- a/pkg/kubelet/cri/remote/BUILD +++ b/pkg/kubelet/cri/remote/BUILD @@ -14,10 +14,10 @@ go_library( "remote_runtime.go", "utils.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/remote", + importpath = "k8s.io/kubernetes/pkg/kubelet/cri/remote", deps = [ "//pkg/kubelet/util:go_default_library", - "//pkg/kubelet/util/logreduction:go_default_library", + "//staging/src/k8s.io/component-base/logs/logreduction:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", "//vendor/google.golang.org/grpc:go_default_library", @@ -37,7 +37,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubelet/remote/fake:all-srcs", + "//pkg/kubelet/cri/remote/fake:all-srcs", ], tags = ["automanaged"], ) @@ -47,7 +47,7 @@ go_test( srcs = ["remote_runtime_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/remote/fake:go_default_library", + "//pkg/kubelet/cri/remote/fake:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/testing:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", diff --git a/pkg/kubelet/cri/remote/fake/BUILD b/pkg/kubelet/cri/remote/fake/BUILD index aa35b63a62f..89b602495a6 100644 --- a/pkg/kubelet/cri/remote/fake/BUILD +++ b/pkg/kubelet/cri/remote/fake/BUILD @@ -16,7 +16,7 @@ go_library( "fake_image_service.go", "fake_runtime.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/remote/fake", + importpath = "k8s.io/kubernetes/pkg/kubelet/cri/remote/fake", deps = [ "//pkg/kubelet/util:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", diff --git a/pkg/kubelet/cri/streaming/BUILD b/pkg/kubelet/cri/streaming/BUILD index 5b45492b11f..ff26feedfed 100644 --- a/pkg/kubelet/cri/streaming/BUILD +++ b/pkg/kubelet/cri/streaming/BUILD @@ -13,10 +13,10 @@ go_library( "request_cache.go", "server.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/server/streaming", + importpath = "k8s.io/kubernetes/pkg/kubelet/cri/streaming", deps = [ - "//pkg/kubelet/server/portforward:go_default_library", - "//pkg/kubelet/server/remotecommand:go_default_library", + "//pkg/kubelet/cri/streaming/portforward:go_default_library", + "//pkg/kubelet/cri/streaming/remotecommand:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/remotecommand:go_default_library", @@ -36,7 +36,7 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubelet/server/portforward:go_default_library", + "//pkg/kubelet/cri/streaming/portforward:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/clock:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", @@ -57,6 +57,10 @@ filegroup( filegroup( name = "all-srcs", - srcs = [":package-srcs"], + srcs = [ + ":package-srcs", + "//pkg/kubelet/cri/streaming/portforward:all-srcs", + "//pkg/kubelet/cri/streaming/remotecommand:all-srcs", + ], tags = ["automanaged"], ) diff --git a/pkg/kubelet/cri/streaming/portforward/BUILD b/pkg/kubelet/cri/streaming/portforward/BUILD index 9c92690117b..59c7f9b110d 100644 --- a/pkg/kubelet/cri/streaming/portforward/BUILD +++ b/pkg/kubelet/cri/streaming/portforward/BUILD @@ -14,7 +14,7 @@ go_library( "portforward.go", "websocket.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/server/portforward", + importpath = "k8s.io/kubernetes/pkg/kubelet/cri/streaming/portforward", deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", diff --git a/pkg/kubelet/cri/streaming/remotecommand/BUILD b/pkg/kubelet/cri/streaming/remotecommand/BUILD index f9a57eb666f..3cd81c00c33 100644 --- a/pkg/kubelet/cri/streaming/remotecommand/BUILD +++ b/pkg/kubelet/cri/streaming/remotecommand/BUILD @@ -14,7 +14,7 @@ go_library( "httpstream.go", "websocket.go", ], - importpath = "k8s.io/kubernetes/pkg/kubelet/server/remotecommand", + importpath = "k8s.io/kubernetes/pkg/kubelet/cri/streaming/remotecommand", deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD index fa4d3f9f8da..f9f2dcce3cb 100644 --- a/pkg/kubelet/dockershim/BUILD +++ b/pkg/kubelet/dockershim/BUILD @@ -42,6 +42,7 @@ go_library( "//pkg/kubelet/checkpointmanager/checksum:go_default_library", "//pkg/kubelet/checkpointmanager/errors:go_default_library", "//pkg/kubelet/container:go_default_library", + "//pkg/kubelet/cri/streaming:go_default_library", "//pkg/kubelet/dockershim/cm:go_default_library", "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/dockershim/metrics:go_default_library", @@ -51,7 +52,6 @@ go_library( "//pkg/kubelet/dockershim/network/kubenet:go_default_library", "//pkg/kubelet/leaky:go_default_library", "//pkg/kubelet/legacy:go_default_library", - "//pkg/kubelet/server/streaming:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/kubelet/util/cache:go_default_library", "//pkg/kubelet/util/ioutils:go_default_library", diff --git a/pkg/kubelet/kuberuntime/BUILD b/pkg/kubelet/kuberuntime/BUILD index 733bc49f29e..9d4d088b18d 100644 --- a/pkg/kubelet/kuberuntime/BUILD +++ b/pkg/kubelet/kuberuntime/BUILD @@ -47,7 +47,6 @@ go_library( "//pkg/kubelet/types:go_default_library", "//pkg/kubelet/util/cache:go_default_library", "//pkg/kubelet/util/format:go_default_library", - "//pkg/kubelet/util/logreduction:go_default_library", "//pkg/security/apparmor:go_default_library", "//pkg/securitycontext:go_default_library", "//pkg/util/parsers:go_default_library", @@ -65,6 +64,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/client-go/tools/reference:go_default_library", "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library", + "//staging/src/k8s.io/component-base/logs/logreduction:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", "//vendor/github.com/armon/circbuf:go_default_library", diff --git a/pkg/kubelet/server/BUILD b/pkg/kubelet/server/BUILD index 30f76cbeab4..00da891949f 100644 --- a/pkg/kubelet/server/BUILD +++ b/pkg/kubelet/server/BUILD @@ -22,13 +22,13 @@ go_library( "//pkg/kubelet/apis/podresources/v1alpha1:go_default_library", "//pkg/kubelet/apis/resourcemetrics/v1alpha1:go_default_library", "//pkg/kubelet/container:go_default_library", + "//pkg/kubelet/cri/streaming:go_default_library", + "//pkg/kubelet/cri/streaming/portforward:go_default_library", + "//pkg/kubelet/cri/streaming/remotecommand:go_default_library", "//pkg/kubelet/metrics/collectors:go_default_library", "//pkg/kubelet/prober:go_default_library", "//pkg/kubelet/server/metrics:go_default_library", - "//pkg/kubelet/server/portforward:go_default_library", - "//pkg/kubelet/server/remotecommand:go_default_library", "//pkg/kubelet/server/stats:go_default_library", - "//pkg/kubelet/server/streaming:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/kubelet/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -74,10 +74,10 @@ go_test( "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", - "//pkg/kubelet/server/portforward:go_default_library", - "//pkg/kubelet/server/remotecommand:go_default_library", + "//pkg/kubelet/cri/streaming:go_default_library", + "//pkg/kubelet/cri/streaming/portforward:go_default_library", + "//pkg/kubelet/cri/streaming/remotecommand:go_default_library", "//pkg/kubelet/server/stats:go_default_library", - "//pkg/kubelet/server/streaming:go_default_library", "//pkg/volume:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -110,10 +110,7 @@ filegroup( srcs = [ ":package-srcs", "//pkg/kubelet/server/metrics:all-srcs", - "//pkg/kubelet/server/portforward:all-srcs", - "//pkg/kubelet/server/remotecommand:all-srcs", "//pkg/kubelet/server/stats:all-srcs", - "//pkg/kubelet/server/streaming:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/kubelet/util/BUILD b/pkg/kubelet/util/BUILD index 3af11eba2f5..d5d44d974e9 100644 --- a/pkg/kubelet/util/BUILD +++ b/pkg/kubelet/util/BUILD @@ -99,7 +99,6 @@ filegroup( "//pkg/kubelet/util/cache:all-srcs", "//pkg/kubelet/util/format:all-srcs", "//pkg/kubelet/util/ioutils:all-srcs", - "//pkg/kubelet/util/logreduction:all-srcs", "//pkg/kubelet/util/manager:all-srcs", "//pkg/kubelet/util/queue:all-srcs", "//pkg/kubelet/util/sliceutils:all-srcs", diff --git a/staging/src/k8s.io/component-base/logs/BUILD b/staging/src/k8s.io/component-base/logs/BUILD index da396606a98..808ec5d7d41 100644 --- a/staging/src/k8s.io/component-base/logs/BUILD +++ b/staging/src/k8s.io/component-base/logs/BUILD @@ -26,6 +26,9 @@ filegroup( filegroup( name = "all-srcs", - srcs = [":package-srcs"], + srcs = [ + ":package-srcs", + "//staging/src/k8s.io/component-base/logs/logreduction:all-srcs", + ], tags = ["automanaged"], ) diff --git a/staging/src/k8s.io/component-base/logs/logreduction/BUILD b/staging/src/k8s.io/component-base/logs/logreduction/BUILD index 6b369981d2a..d0fa90d14f1 100644 --- a/staging/src/k8s.io/component-base/logs/logreduction/BUILD +++ b/staging/src/k8s.io/component-base/logs/logreduction/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["logreduction.go"], - importpath = "k8s.io/kubernetes/pkg/kubelet/util/logreduction", + importmap = "k8s.io/kubernetes/vendor/k8s.io/component-base/logs/logreduction", + importpath = "k8s.io/component-base/logs/logreduction", visibility = ["//visibility:public"], ) diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index ee9592ca580..1406c048191 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -34,9 +34,9 @@ go_library( "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/cm/cpuset:go_default_library", + "//pkg/kubelet/cri/remote:go_default_library", "//pkg/kubelet/kubeletconfig/util/codec:go_default_library", "//pkg/kubelet/metrics:go_default_library", - "//pkg/kubelet/remote:go_default_library", "//pkg/kubelet/util:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/equality:go_default_library",