Merge pull request #79198 from damemi/kubectl-logs

Move pkg/kubectl/util/logs to staging

cmd/kubectl/BUILD

@@ -20,9 +20,9 @@ go_library(
     visibility = ["//visibility:private"],
     deps = [
         "//pkg/kubectl/cmd:go_default_library",
-        "//pkg/kubectl/util/logs:go_default_library",
         "//staging/src/k8s.io/client-go/plugin/pkg/client/auth:go_default_library",
         "//staging/src/k8s.io/component-base/cli/flag:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/util/logs:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
     ],
 )

cmd/kubectl/kubectl.go

@@ -26,8 +26,8 @@ import (
 	"github.com/spf13/pflag"
 
 	cliflag "k8s.io/component-base/cli/flag"
+	"k8s.io/kubectl/pkg/util/logs"
 	"k8s.io/kubernetes/pkg/kubectl/cmd"
-	"k8s.io/kubernetes/pkg/kubectl/util/logs"
 
 	// Import to initialize client auth plugins.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"

pkg/kubectl/util/BUILD

@@ -67,7 +67,6 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//pkg/kubectl/util/i18n:all-srcs",
-        "//pkg/kubectl/util/logs:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//build/visible_to:pkg_kubectl_util_CONSUMERS"],

staging/publishing/import-restrictions.yaml

@@ -131,6 +131,7 @@
   - k8s.io/client-go
   - k8s.io/kubectl
   - k8s.io/utils
+  - k8s.io/klog
 
 - baseImportPath: "./vendor/k8s.io/sample-apiserver/"
   allowedImports:

staging/src/k8s.io/kubectl/BUILD

@@ -15,6 +15,7 @@ filegroup(
         "//staging/src/k8s.io/kubectl/pkg/util/fieldpath:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/hash:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/interrupt:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/util/logs:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/printers:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/qos:all-srcs",

staging/src/k8s.io/kubectl/go.mod

@@ -20,6 +20,7 @@ require (
 	k8s.io/api v0.0.0
 	k8s.io/apimachinery v0.0.0
 	k8s.io/client-go v0.0.0
+	k8s.io/klog v0.3.1
 	k8s.io/utils v0.0.0-20190221042446-c2654d5206da
 )
 

staging/src/k8s.io/kubectl/pkg/util/logs/BUILD

@@ -8,7 +8,8 @@ load(
 go_library(
     name = "go_default_library",
     srcs = ["logs.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/util/logs",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/logs",
+    importpath = "k8s.io/kubectl/pkg/util/logs",
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",

vendor/modules.txt

@@ -1642,6 +1642,7 @@ k8s.io/kubectl/pkg/util/event
 k8s.io/kubectl/pkg/util/fieldpath
 k8s.io/kubectl/pkg/util/hash
 k8s.io/kubectl/pkg/util/interrupt
+k8s.io/kubectl/pkg/util/logs
 k8s.io/kubectl/pkg/util/podutils
 k8s.io/kubectl/pkg/util/printers
 k8s.io/kubectl/pkg/util/qos