From cf3635c876fc683a124d0819f4556aaabc7520bc Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Wed, 3 May 2017 13:52:39 -0700 Subject: [PATCH] Update bazel BUID files --- cmd/kubelet/app/BUILD | 2 +- cmd/kubemark/BUILD | 2 +- pkg/kubelet/BUILD | 2 +- pkg/kubelet/dockershim/BUILD | 5 +- pkg/kubelet/dockershim/cm/BUILD | 2 +- pkg/kubelet/dockershim/libdocker/BUILD | 69 ++++++++++++++++++++++++++ pkg/kubelet/dockertools/BUILD | 28 ++--------- pkg/kubelet/gpu/nvidia/BUILD | 2 +- pkg/kubelet/kuberuntime/BUILD | 2 +- pkg/kubelet/sysctl/BUILD | 1 - pkg/kubemark/BUILD | 2 +- test/e2e_node/BUILD | 2 +- 12 files changed, 84 insertions(+), 35 deletions(-) create mode 100644 pkg/kubelet/dockershim/libdocker/BUILD diff --git a/cmd/kubelet/app/BUILD b/cmd/kubelet/app/BUILD index 699f89865f..c29b3791ea 100644 --- a/cmd/kubelet/app/BUILD +++ b/cmd/kubelet/app/BUILD @@ -56,8 +56,8 @@ go_library( "//pkg/kubelet/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/dockershim/remote:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", "//pkg/kubelet/eviction:go_default_library", "//pkg/kubelet/eviction/api:go_default_library", "//pkg/kubelet/network:go_default_library", diff --git a/cmd/kubemark/BUILD b/cmd/kubemark/BUILD index cde439603c..59052a7a84 100644 --- a/cmd/kubemark/BUILD +++ b/cmd/kubemark/BUILD @@ -25,7 +25,7 @@ go_library( "//pkg/client/metrics/prometheus:go_default_library", "//pkg/kubelet/cadvisor/testing:go_default_library", "//pkg/kubelet/cm:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubemark:go_default_library", "//pkg/util/iptables/testing:go_default_library", "//pkg/version/prometheus:go_default_library", diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index a2a24449ae..f67231bfea 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -56,8 +56,8 @@ go_library( "//pkg/kubelet/config:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/dockershim/remote:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", "//pkg/kubelet/envvars:go_default_library", "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/eviction:go_default_library", diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD index 1fe7673bd4..73ef044cd7 100644 --- a/pkg/kubelet/dockershim/BUILD +++ b/pkg/kubelet/dockershim/BUILD @@ -39,8 +39,8 @@ go_library( "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/dockershim/cm:go_default_library", "//pkg/kubelet/dockershim/errors:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/dockershim/securitycontext:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", "//pkg/kubelet/leaky:go_default_library", "//pkg/kubelet/network:go_default_library", "//pkg/kubelet/network/cni:go_default_library", @@ -96,9 +96,9 @@ go_test( "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/container/testing:go_default_library", "//pkg/kubelet/dockershim/errors:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/dockershim/securitycontext:go_default_library", "//pkg/kubelet/dockershim/testing:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", "//pkg/kubelet/network:go_default_library", "//pkg/kubelet/network/testing:go_default_library", "//pkg/kubelet/types:go_default_library", @@ -128,6 +128,7 @@ filegroup( ":package-srcs", "//pkg/kubelet/dockershim/cm:all-srcs", "//pkg/kubelet/dockershim/errors:all-srcs", + "//pkg/kubelet/dockershim/libdocker:all-srcs", "//pkg/kubelet/dockershim/remote:all-srcs", "//pkg/kubelet/dockershim/securitycontext:all-srcs", "//pkg/kubelet/dockershim/testing:all-srcs", diff --git a/pkg/kubelet/dockershim/cm/BUILD b/pkg/kubelet/dockershim/cm/BUILD index 4e107f8101..426cc237d6 100644 --- a/pkg/kubelet/dockershim/cm/BUILD +++ b/pkg/kubelet/dockershim/cm/BUILD @@ -16,7 +16,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/kubelet/cm:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/qos:go_default_library", "//pkg/util/version:go_default_library", "//vendor/github.com/golang/glog:go_default_library", diff --git a/pkg/kubelet/dockershim/libdocker/BUILD b/pkg/kubelet/dockershim/libdocker/BUILD new file mode 100644 index 0000000000..871260aeb8 --- /dev/null +++ b/pkg/kubelet/dockershim/libdocker/BUILD @@ -0,0 +1,69 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["notice"]) + +load( + "@io_bazel_rules_go//go:def.bzl", + "go_library", + "go_test", +) + +go_test( + name = "go_default_test", + srcs = [ + "helpers_test.go", + "kube_docker_client_test.go", + "legacy_test.go", + ], + library = ":go_default_library", + tags = ["automanaged"], + deps = [ + "//pkg/api/v1:go_default_library", + "//pkg/util/hash:go_default_library", + "//vendor/github.com/docker/engine-api/types:go_default_library", + "//vendor/github.com/stretchr/testify/assert:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", + ], +) + +go_library( + name = "go_default_library", + srcs = [ + "client.go", + "fake_client.go", + "helpers.go", + "instrumented_client.go", + "kube_docker_client.go", + "legacy.go", + ], + tags = ["automanaged"], + deps = [ + "//pkg/api/v1:go_default_library", + "//pkg/kubelet/container:go_default_library", + "//pkg/kubelet/metrics:go_default_library", + "//vendor/github.com/docker/distribution/digest:go_default_library", + "//vendor/github.com/docker/distribution/reference:go_default_library", + "//vendor/github.com/docker/docker/pkg/jsonmessage:go_default_library", + "//vendor/github.com/docker/docker/pkg/stdcopy:go_default_library", + "//vendor/github.com/docker/engine-api/client:go_default_library", + "//vendor/github.com/docker/engine-api/types:go_default_library", + "//vendor/github.com/docker/engine-api/types/container:go_default_library", + "//vendor/github.com/golang/glog:go_default_library", + "//vendor/golang.org/x/net/context:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", + "//vendor/k8s.io/client-go/util/clock:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], +) diff --git a/pkg/kubelet/dockertools/BUILD b/pkg/kubelet/dockertools/BUILD index a5e8c7efab..f4229dd5f5 100644 --- a/pkg/kubelet/dockertools/BUILD +++ b/pkg/kubelet/dockertools/BUILD @@ -10,40 +10,23 @@ load( go_library( name = "go_default_library", - srcs = [ - "docker.go", - "fake_docker_client.go", - "instrumented_docker.go", - "kube_docker_client.go", - ], + srcs = ["docker.go"], tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", "//pkg/credentialprovider:go_default_library", - "//pkg/kubelet/container:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/images:go_default_library", - "//pkg/kubelet/metrics:go_default_library", - "//vendor/github.com/docker/distribution/digest:go_default_library", - "//vendor/github.com/docker/distribution/reference:go_default_library", "//vendor/github.com/docker/docker/pkg/jsonmessage:go_default_library", - "//vendor/github.com/docker/docker/pkg/stdcopy:go_default_library", - "//vendor/github.com/docker/engine-api/client:go_default_library", "//vendor/github.com/docker/engine-api/types:go_default_library", - "//vendor/github.com/docker/engine-api/types/container:go_default_library", "//vendor/github.com/golang/glog:go_default_library", - "//vendor/golang.org/x/net/context:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", - "//vendor/k8s.io/client-go/util/clock:go_default_library", ], ) go_test( name = "go_default_test", - srcs = [ - "docker_test.go", - "kube_docker_client_test.go", - ], + srcs = ["docker_test.go"], library = ":go_default_library", tags = [ "automanaged", @@ -51,12 +34,9 @@ go_test( deps = [ "//pkg/api/v1:go_default_library", "//pkg/credentialprovider:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/images:go_default_library", - "//pkg/util/hash:go_default_library", "//vendor/github.com/docker/docker/pkg/jsonmessage:go_default_library", - "//vendor/github.com/docker/engine-api/types:go_default_library", - "//vendor/github.com/stretchr/testify/assert:go_default_library", - "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", ], ) diff --git a/pkg/kubelet/gpu/nvidia/BUILD b/pkg/kubelet/gpu/nvidia/BUILD index 11205a78c0..8c016e3a89 100644 --- a/pkg/kubelet/gpu/nvidia/BUILD +++ b/pkg/kubelet/gpu/nvidia/BUILD @@ -17,7 +17,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/gpu:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", diff --git a/pkg/kubelet/kuberuntime/BUILD b/pkg/kubelet/kuberuntime/BUILD index 97999d047c..14a8833d02 100644 --- a/pkg/kubelet/kuberuntime/BUILD +++ b/pkg/kubelet/kuberuntime/BUILD @@ -34,7 +34,6 @@ go_library( "//pkg/kubelet/api:go_default_library", "//pkg/kubelet/api/v1alpha1/runtime:go_default_library", "//pkg/kubelet/container:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/images:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", @@ -76,6 +75,7 @@ go_test( "kuberuntime_manager_test.go", "kuberuntime_sandbox_test.go", "labels_test.go", + "legacy_test.go", ], library = ":go_default_library", tags = ["automanaged"], diff --git a/pkg/kubelet/sysctl/BUILD b/pkg/kubelet/sysctl/BUILD index 73c0f63ab5..cbd232d86d 100644 --- a/pkg/kubelet/sysctl/BUILD +++ b/pkg/kubelet/sysctl/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/api/validation:go_default_library", "//pkg/apis/extensions/validation:go_default_library", "//pkg/kubelet/container:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", "//pkg/kubelet/lifecycle:go_default_library", ], ) diff --git a/pkg/kubemark/BUILD b/pkg/kubemark/BUILD index cb3e44aea1..1b916999f1 100644 --- a/pkg/kubemark/BUILD +++ b/pkg/kubemark/BUILD @@ -27,7 +27,7 @@ go_library( "//pkg/kubelet/cadvisor:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container/testing:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/types:go_default_library", "//pkg/util:go_default_library", "//pkg/util/io:go_default_library", diff --git a/test/e2e_node/BUILD b/test/e2e_node/BUILD index 4767d9ae47..a3b198d9c2 100644 --- a/test/e2e_node/BUILD +++ b/test/e2e_node/BUILD @@ -101,7 +101,7 @@ go_test( "//pkg/kubelet/api/v1alpha1/stats:go_default_library", "//pkg/kubelet/cm:go_default_library", "//pkg/kubelet/container:go_default_library", - "//pkg/kubelet/dockertools:go_default_library", + "//pkg/kubelet/dockershim/libdocker:go_default_library", "//pkg/kubelet/images:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//pkg/kubelet/types:go_default_library",