diff --git a/cmd/gke-certificates-controller/BUILD b/cmd/gke-certificates-controller/BUILD index 787fedd608..9ec77ac35e 100644 --- a/cmd/gke-certificates-controller/BUILD +++ b/cmd/gke-certificates-controller/BUILD @@ -14,7 +14,7 @@ go_library( tags = ["automanaged"], deps = [ "//cmd/gke-certificates-controller/app:go_default_library", - "//pkg/util/logs:go_default_library", + "//pkg/kubectl/util/logs:go_default_library", "//pkg/version/verflag:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library", diff --git a/cmd/gke-certificates-controller/main.go b/cmd/gke-certificates-controller/main.go index 21e07157cd..a0679d95d6 100644 --- a/cmd/gke-certificates-controller/main.go +++ b/cmd/gke-certificates-controller/main.go @@ -25,7 +25,7 @@ import ( "k8s.io/apiserver/pkg/util/flag" "k8s.io/kubernetes/cmd/gke-certificates-controller/app" - "k8s.io/kubernetes/pkg/util/logs" + "k8s.io/kubernetes/pkg/kubectl/util/logs" "k8s.io/kubernetes/pkg/version/verflag" "github.com/spf13/pflag" diff --git a/cmd/kubectl/app/BUILD b/cmd/kubectl/app/BUILD index 9ed063cbd0..93c710518a 100644 --- a/cmd/kubectl/app/BUILD +++ b/cmd/kubectl/app/BUILD @@ -16,7 +16,7 @@ go_library( "//pkg/client/metrics/prometheus:go_default_library", "//pkg/kubectl/cmd:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/util/logs:go_default_library", + "//pkg/kubectl/util/logs:go_default_library", "//pkg/version/prometheus:go_default_library", "//vendor/k8s.io/client-go/plugin/pkg/client/auth:go_default_library", ], diff --git a/cmd/kubectl/app/kubectl.go b/cmd/kubectl/app/kubectl.go index 536aa57b95..7d39fd7ec7 100644 --- a/cmd/kubectl/app/kubectl.go +++ b/cmd/kubectl/app/kubectl.go @@ -23,7 +23,7 @@ import ( _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration "k8s.io/kubernetes/pkg/kubectl/cmd" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/logs" + "k8s.io/kubernetes/pkg/kubectl/util/logs" _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration ) diff --git a/federation/cmd/kubefed/app/BUILD b/federation/cmd/kubefed/app/BUILD index 75ae5bb2c6..66ab4458d9 100644 --- a/federation/cmd/kubefed/app/BUILD +++ b/federation/cmd/kubefed/app/BUILD @@ -15,7 +15,7 @@ go_library( "//federation/pkg/kubefed:go_default_library", "//pkg/client/metrics/prometheus:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/util/logs:go_default_library", + "//pkg/kubectl/util/logs:go_default_library", "//pkg/version:go_default_library", "//pkg/version/prometheus:go_default_library", ], diff --git a/federation/cmd/kubefed/app/kubefed.go b/federation/cmd/kubefed/app/kubefed.go index a08d363fa5..4b481c0bab 100644 --- a/federation/cmd/kubefed/app/kubefed.go +++ b/federation/cmd/kubefed/app/kubefed.go @@ -23,7 +23,7 @@ import ( "k8s.io/kubernetes/federation/pkg/kubefed" _ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/util/logs" + "k8s.io/kubernetes/pkg/kubectl/util/logs" "k8s.io/kubernetes/pkg/version" _ "k8s.io/kubernetes/pkg/version/prometheus" // for version metric registration ) diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 58209d598a..ee530bdf5d 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -32,6 +32,7 @@ filegroup( srcs = [ ":package-srcs", "//pkg/kubectl/util/crlf:all-srcs", + "//pkg/kubectl/util/logs:all-srcs", "//pkg/kubectl/util/slice:all-srcs", "//pkg/kubectl/util/term:all-srcs", ], diff --git a/pkg/util/logs/BUILD b/pkg/kubectl/util/logs/BUILD similarity index 100% rename from pkg/util/logs/BUILD rename to pkg/kubectl/util/logs/BUILD diff --git a/pkg/util/logs/logs.go b/pkg/kubectl/util/logs/logs.go similarity index 100% rename from pkg/util/logs/logs.go rename to pkg/kubectl/util/logs/logs.go diff --git a/pkg/util/BUILD b/pkg/util/BUILD index a2916a9a13..8b130c885c 100644 --- a/pkg/util/BUILD +++ b/pkg/util/BUILD @@ -33,7 +33,6 @@ filegroup( "//pkg/util/keymutex:all-srcs", "//pkg/util/labels:all-srcs", "//pkg/util/limitwriter:all-srcs", - "//pkg/util/logs:all-srcs", "//pkg/util/maps:all-srcs", "//pkg/util/metrics:all-srcs", "//pkg/util/mount:all-srcs", diff --git a/test/e2e/BUILD b/test/e2e/BUILD index ff80b72bbe..f54746f086 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -76,9 +76,9 @@ go_library( "//pkg/cloudprovider/providers/azure:go_default_library", "//pkg/cloudprovider/providers/gce:go_default_library", "//pkg/controller/node:go_default_library", + "//pkg/kubectl/util/logs:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/quota/evaluator/core:go_default_library", - "//pkg/util/logs:go_default_library", "//pkg/util/version:go_default_library", "//plugin/pkg/admission/serviceaccount:go_default_library", "//test/e2e/common:go_default_library", diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go index 73dda449f7..dd20e04cf9 100644 --- a/test/e2e/e2e.go +++ b/test/e2e/e2e.go @@ -36,7 +36,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/pkg/cloudprovider/providers/azure" gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" - "k8s.io/kubernetes/pkg/util/logs" + "k8s.io/kubernetes/pkg/kubectl/util/logs" commontest "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper"