From 18c7ee81146c940237a6e2be23da076f165a6bcb Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 25 Jul 2019 12:01:00 -0700 Subject: [PATCH] Move pkg/kubectl/proxy to staging --- pkg/kubectl/BUILD | 1 - pkg/kubectl/cmd/proxy/BUILD | 2 +- pkg/kubectl/cmd/proxy/proxy.go | 2 +- staging/src/k8s.io/kubectl/BUILD | 1 + staging/src/k8s.io/kubectl/go.sum | 1 + .../src/k8s.io/kubectl/pkg}/proxy/BUILD | 35 +++++++++---------- .../k8s.io/kubectl/pkg}/proxy/proxy_server.go | 0 .../kubectl/pkg}/proxy/proxy_server_test.go | 0 vendor/modules.txt | 1 + 9 files changed, 21 insertions(+), 22 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/proxy/BUILD (79%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/proxy/proxy_server.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/proxy/proxy_server_test.go (100%) diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 4bac239e5dd..bd5fd5f697c 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -84,7 +84,6 @@ filegroup( ":package-srcs", "//pkg/kubectl/cmd:all-srcs", "//pkg/kubectl/explain:all-srcs", - "//pkg/kubectl/proxy:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/kubectl/cmd/proxy/BUILD b/pkg/kubectl/cmd/proxy/BUILD index 008b4cdc153..6bd635e2008 100644 --- a/pkg/kubectl/cmd/proxy/BUILD +++ b/pkg/kubectl/cmd/proxy/BUILD @@ -6,9 +6,9 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/proxy", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/proxy:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/proxy:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/proxy/proxy.go b/pkg/kubectl/cmd/proxy/proxy.go index 3ffae9c19b3..1867b02b581 100644 --- a/pkg/kubectl/cmd/proxy/proxy.go +++ b/pkg/kubectl/cmd/proxy/proxy.go @@ -28,9 +28,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/klog" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/proxy" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/proxy" ) var ( diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index f2c4e18b76e..5cdf8140585 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -18,6 +18,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/generated:all-srcs", "//staging/src/k8s.io/kubectl/pkg/metricsutil:all-srcs", "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/proxy:all-srcs", "//staging/src/k8s.io/kubectl/pkg/rawhttp:all-srcs", "//staging/src/k8s.io/kubectl/pkg/scheme:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util:all-srcs", diff --git a/staging/src/k8s.io/kubectl/go.sum b/staging/src/k8s.io/kubectl/go.sum index e5e6a80cb85..df42fc7a8dd 100644 --- a/staging/src/k8s.io/kubectl/go.sum +++ b/staging/src/k8s.io/kubectl/go.sum @@ -116,6 +116,7 @@ github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= diff --git a/pkg/kubectl/proxy/BUILD b/staging/src/k8s.io/kubectl/pkg/proxy/BUILD similarity index 79% rename from pkg/kubectl/proxy/BUILD rename to staging/src/k8s.io/kubectl/pkg/proxy/BUILD index 6ce53f6c157..9a29fd8d463 100644 --- a/pkg/kubectl/proxy/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/proxy/BUILD @@ -1,9 +1,19 @@ -package(default_visibility = ["//visibility:public"]) +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", +go_library( + name = "go_default_library", + srcs = ["proxy_server.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/proxy", + importpath = "k8s.io/kubectl/pkg/proxy", + visibility = ["//visibility:public"], + deps = [ + "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/proxy:go_default_library", + "//staging/src/k8s.io/client-go/rest:go_default_library", + "//staging/src/k8s.io/client-go/transport:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", + "//vendor/k8s.io/klog:go_default_library", + ], ) go_test( @@ -16,20 +26,6 @@ go_test( ], ) -go_library( - name = "go_default_library", - srcs = ["proxy_server.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/proxy", - deps = [ - "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/proxy:go_default_library", - "//staging/src/k8s.io/client-go/rest:go_default_library", - "//staging/src/k8s.io/client-go/transport:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", - "//vendor/k8s.io/klog:go_default_library", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), @@ -41,4 +37,5 @@ filegroup( name = "all-srcs", srcs = [":package-srcs"], tags = ["automanaged"], + visibility = ["//visibility:public"], ) diff --git a/pkg/kubectl/proxy/proxy_server.go b/staging/src/k8s.io/kubectl/pkg/proxy/proxy_server.go similarity index 100% rename from pkg/kubectl/proxy/proxy_server.go rename to staging/src/k8s.io/kubectl/pkg/proxy/proxy_server.go diff --git a/pkg/kubectl/proxy/proxy_server_test.go b/staging/src/k8s.io/kubectl/pkg/proxy/proxy_server_test.go similarity index 100% rename from pkg/kubectl/proxy/proxy_server_test.go rename to staging/src/k8s.io/kubectl/pkg/proxy/proxy_server_test.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 2a86bbb316b..8078de72be3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1654,6 +1654,7 @@ k8s.io/kubectl/pkg/generate/versioned k8s.io/kubectl/pkg/generated k8s.io/kubectl/pkg/metricsutil k8s.io/kubectl/pkg/polymorphichelpers +k8s.io/kubectl/pkg/proxy k8s.io/kubectl/pkg/rawhttp k8s.io/kubectl/pkg/scheme k8s.io/kubectl/pkg/util