From c35c00f3f152ccc9da8057499faf27c673a03ca2 Mon Sep 17 00:00:00 2001 From: Yu-Ju Hong Date: Mon, 1 May 2017 17:32:58 -0700 Subject: [PATCH] update bazel --- pkg/kubelet/dockershim/BUILD | 10 ++++++++-- pkg/kubelet/dockertools/BUILD | 11 +---------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkg/kubelet/dockershim/BUILD b/pkg/kubelet/dockershim/BUILD index 4b23c221e9e..10d0045f0a4 100644 --- a/pkg/kubelet/dockershim/BUILD +++ b/pkg/kubelet/dockershim/BUILD @@ -21,6 +21,7 @@ go_library( "docker_sandbox.go", "docker_service.go", "docker_streaming.go", + "exec.go", "helpers.go", "naming.go", "security_context.go", @@ -37,8 +38,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/securitycontext:go_default_library", "//pkg/kubelet/dockertools:go_default_library", - "//pkg/kubelet/dockertools/securitycontext:go_default_library", "//pkg/kubelet/leaky:go_default_library", "//pkg/kubelet/network:go_default_library", "//pkg/kubelet/network/cni:go_default_library", @@ -49,7 +50,10 @@ go_library( "//pkg/kubelet/types:go_default_library", "//pkg/kubelet/util/cache:go_default_library", "//pkg/kubelet/util/ioutils:go_default_library", + "//pkg/security/apparmor:go_default_library", + "//pkg/util/exec:go_default_library", "//pkg/util/hash:go_default_library", + "//pkg/util/term:go_default_library", "//vendor/github.com/blang/semver:go_default_library", "//vendor/github.com/docker/engine-api/types:go_default_library", "//vendor/github.com/docker/engine-api/types/container:go_default_library", @@ -57,6 +61,7 @@ go_library( "//vendor/github.com/docker/engine-api/types/strslice:go_default_library", "//vendor/github.com/docker/go-connections/nat:go_default_library", "//vendor/github.com/golang/glog:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", @@ -86,9 +91,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/securitycontext:go_default_library", "//pkg/kubelet/dockershim/testing:go_default_library", "//pkg/kubelet/dockertools:go_default_library", - "//pkg/kubelet/dockertools/securitycontext:go_default_library", "//pkg/kubelet/network:go_default_library", "//pkg/kubelet/network/testing:go_default_library", "//pkg/kubelet/types:go_default_library", @@ -119,6 +124,7 @@ filegroup( "//pkg/kubelet/dockershim/cm:all-srcs", "//pkg/kubelet/dockershim/errors:all-srcs", "//pkg/kubelet/dockershim/remote:all-srcs", + "//pkg/kubelet/dockershim/securitycontext:all-srcs", "//pkg/kubelet/dockershim/testing:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/kubelet/dockertools/BUILD b/pkg/kubelet/dockertools/BUILD index 20d0bcbb43c..400f22b0aaa 100644 --- a/pkg/kubelet/dockertools/BUILD +++ b/pkg/kubelet/dockertools/BUILD @@ -14,7 +14,6 @@ go_library( "docker.go", "docker_manager.go", "docker_manager_linux.go", - "exec.go", "fake_docker_client.go", "instrumented_docker.go", "kube_docker_client.go", @@ -22,15 +21,11 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/client/unversioned/remotecommand:go_default_library", "//pkg/credentialprovider:go_default_library", "//pkg/kubelet/container:go_default_library", "//pkg/kubelet/images:go_default_library", "//pkg/kubelet/leaky:go_default_library", "//pkg/kubelet/metrics:go_default_library", - "//pkg/security/apparmor:go_default_library", - "//pkg/util/exec:go_default_library", - "//pkg/util/term: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", @@ -40,7 +35,6 @@ go_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/apis/meta/v1: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", @@ -82,9 +76,6 @@ filegroup( filegroup( name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/kubelet/dockertools/securitycontext:all-srcs", - ], + srcs = [":package-srcs"], tags = ["automanaged"], )