From a710a83aa93e2d1c06ffacda3caa06c0e144ac05 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Wed, 19 Jun 2019 22:37:10 -0400 Subject: [PATCH 1/3] Move pkg/util/logs to staging and update ref --- cmd/kubectl/kubectl.go | 2 +- {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/logs/BUILD | 0 .../src/k8s.io/kubectl/pkg}/util/logs/logs.go | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/logs/BUILD (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/logs/logs.go (100%) diff --git a/cmd/kubectl/kubectl.go b/cmd/kubectl/kubectl.go index dff1143b017..5c2445787a9 100644 --- a/cmd/kubectl/kubectl.go +++ b/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" diff --git a/pkg/kubectl/util/logs/BUILD b/staging/src/k8s.io/kubectl/pkg/util/logs/BUILD similarity index 100% rename from pkg/kubectl/util/logs/BUILD rename to staging/src/k8s.io/kubectl/pkg/util/logs/BUILD diff --git a/pkg/kubectl/util/logs/logs.go b/staging/src/k8s.io/kubectl/pkg/util/logs/logs.go similarity index 100% rename from pkg/kubectl/util/logs/logs.go rename to staging/src/k8s.io/kubectl/pkg/util/logs/logs.go From f11e1209783f4fe5c7dbbecd0468ae5c543ff673 Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Thu, 27 Jun 2019 15:18:46 -0400 Subject: [PATCH 2/3] update vendor --- cmd/kubectl/BUILD | 2 +- pkg/kubectl/util/BUILD | 1 - staging/src/k8s.io/kubectl/BUILD | 1 + staging/src/k8s.io/kubectl/go.mod | 1 + staging/src/k8s.io/kubectl/pkg/util/logs/BUILD | 3 ++- vendor/modules.txt | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cmd/kubectl/BUILD b/cmd/kubectl/BUILD index a1e8f856554..9c703ea065e 100644 --- a/cmd/kubectl/BUILD +++ b/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", ], ) diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index adc4394e555..3da13341ccb 100644 --- a/pkg/kubectl/util/BUILD +++ b/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"], diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 2fed2c8d392..1794e1935be 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/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", diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index 8800fcbc3bb..df86e96f781 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/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 ) diff --git a/staging/src/k8s.io/kubectl/pkg/util/logs/BUILD b/staging/src/k8s.io/kubectl/pkg/util/logs/BUILD index 9813e0015db..52f4e693899 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/logs/BUILD +++ b/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", diff --git a/vendor/modules.txt b/vendor/modules.txt index 43db27e2ec8..6606ac9d976 100644 --- a/vendor/modules.txt +++ b/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 From 0f0d11e0a341213ac71f45901437267af0b4a2fb Mon Sep 17 00:00:00 2001 From: Mike Dame Date: Thu, 27 Jun 2019 16:46:47 -0400 Subject: [PATCH 3/3] update import-restrictions --- staging/publishing/import-restrictions.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index bf7c21678c2..2f34bb27971 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/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: