From d3726b91e2c4c0a945151649230c41d326cf643c Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Tue, 3 Nov 2020 10:22:36 +0100 Subject: [PATCH] Move pkg/kubectl/cmd/auth under staging/src/k8s.io/kubectl/pkg/cmd/auth --- build/visible_to/BUILD | 1 + pkg/kubectl/cmd/BUILD | 3 +- pkg/kubectl/cmd/cmd.go | 2 +- staging/publishing/import-restrictions.yaml | 1 + staging/publishing/rules.yaml | 32 +++++++------- staging/src/k8s.io/kubectl/go.mod | 2 + staging/src/k8s.io/kubectl/pkg/cmd/BUILD | 1 + .../src/k8s.io/kubectl/pkg}/cmd/auth/BUILD | 42 ++++++++----------- .../src/k8s.io/kubectl/pkg}/cmd/auth/OWNERS | 0 .../src/k8s.io/kubectl/pkg}/cmd/auth/auth.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/auth/cani.go | 0 .../k8s.io/kubectl/pkg}/cmd/auth/cani_test.go | 0 .../k8s.io/kubectl/pkg}/cmd/auth/reconcile.go | 0 vendor/modules.txt | 1 + 14 files changed, 43 insertions(+), 42 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/auth/BUILD (90%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/auth/OWNERS (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/auth/auth.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/auth/cani.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/auth/cani_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/auth/reconcile.go (100%) diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD index 1f2b7ecc4e2..dd05b846c2b 100644 --- a/build/visible_to/BUILD +++ b/build/visible_to/BUILD @@ -243,6 +243,7 @@ package_group( "//staging/src/k8s.io/kubectl/pkg/cmd/annotate", "//staging/src/k8s.io/kubectl/pkg/cmd/apply", "//staging/src/k8s.io/kubectl/pkg/cmd/attach", + "//staging/src/k8s.io/kubectl/pkg/cmd/auth", "//staging/src/k8s.io/kubectl/pkg/cmd/certificates", "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo", "//staging/src/k8s.io/kubectl/pkg/cmd/config", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 96acbf5d3c6..e41c04662df 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -9,7 +9,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/auth:go_default_library", "//pkg/kubectl/cmd/convert:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", @@ -20,6 +19,7 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/cmd/apiresources:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/apply:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/attach:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/auth:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/autoscale:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/certificates:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo:go_default_library", @@ -84,7 +84,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/cmd/auth:all-srcs", "//pkg/kubectl/cmd/convert:all-srcs", "//pkg/kubectl/cmd/plugin/testdata:all-srcs", ], diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 8da386057c7..2e8dc6f84b8 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -36,6 +36,7 @@ import ( "k8s.io/kubectl/pkg/cmd/apiresources" "k8s.io/kubectl/pkg/cmd/apply" "k8s.io/kubectl/pkg/cmd/attach" + "k8s.io/kubectl/pkg/cmd/auth" "k8s.io/kubectl/pkg/cmd/autoscale" "k8s.io/kubectl/pkg/cmd/certificates" "k8s.io/kubectl/pkg/cmd/clusterinfo" @@ -72,7 +73,6 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/term" - "k8s.io/kubernetes/pkg/kubectl/cmd/auth" "k8s.io/kubernetes/pkg/kubectl/cmd/convert" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index 09cf424524a..29be060cb38 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -133,6 +133,7 @@ - k8s.io/cli-runtime - k8s.io/client-go - k8s.io/component-base + - k8s.io/component-helpers - k8s.io/kubectl - k8s.io/kube-openapi - k8s.io/metrics diff --git a/staging/publishing/rules.yaml b/staging/publishing/rules.yaml index 6e6b6dad90c..12c2819b15c 100644 --- a/staging/publishing/rules.yaml +++ b/staging/publishing/rules.yaml @@ -184,6 +184,21 @@ rules: - repository: client-go branch: release-1.19 +- destination: component-helpers + library: true + branches: + - source: + branch: master + dir: staging/src/k8s.io/component-helpers + name: master + dependencies: + - repository: apimachinery + branch: master + - repository: api + branch: master + - repository: client-go + branch: master + - destination: apiserver library: true branches: @@ -1285,6 +1300,8 @@ rules: branch: master - repository: component-base branch: master + - repository: component-helpers + branch: master - repository: metrics branch: master - source: @@ -1355,18 +1372,3 @@ rules: branch: master dir: staging/src/k8s.io/mount-utils name: master - -- destination: component-helpers - library: true - branches: - - source: - branch: master - dir: staging/src/k8s.io/component-helpers - name: master - dependencies: - - repository: apimachinery - branch: master - - repository: api - branch: master - - repository: client-go - branch: master diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index c9945c066bb..e53a9ff54fd 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -39,6 +39,7 @@ require ( k8s.io/cli-runtime v0.0.0 k8s.io/client-go v0.0.0 k8s.io/component-base v0.0.0 + k8s.io/component-helpers v0.0.0 k8s.io/klog/v2 v2.2.0 k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488 k8s.io/metrics v0.0.0 @@ -54,6 +55,7 @@ replace ( k8s.io/client-go => ../client-go k8s.io/code-generator => ../code-generator k8s.io/component-base => ../component-base + k8s.io/component-helpers => ../component-helpers k8s.io/kubectl => ../kubectl k8s.io/metrics => ../metrics ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD index f9f58902e1e..1b208e2b9dd 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD @@ -32,6 +32,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/cmd/apiresources:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/apply:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/attach:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/auth:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/autoscale:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/certificates:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo:all-srcs", diff --git a/pkg/kubectl/cmd/auth/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/auth/BUILD similarity index 90% rename from pkg/kubectl/cmd/auth/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/auth/BUILD index 40fdd498b58..83a4e6b0cc4 100644 --- a/pkg/kubectl/cmd/auth/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/auth/BUILD @@ -1,8 +1,4 @@ -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", @@ -11,10 +7,9 @@ go_library( "cani.go", "reconcile.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/auth", - visibility = [ - "//build/visible_to:pkg_kubectl_cmd_auth_CONSUMERS", - ], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/auth", + importpath = "k8s.io/kubectl/pkg/cmd/auth", + visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/authorization/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library", @@ -44,21 +39,6 @@ go_library( ], ) -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = [ - "//build/visible_to:pkg_kubectl_cmd_auth_CONSUMERS", - ], -) - go_test( name = "go_default_test", srcs = ["cani_test.go"], @@ -74,3 +54,17 @@ go_test( "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], ) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/kubectl/cmd/auth/OWNERS b/staging/src/k8s.io/kubectl/pkg/cmd/auth/OWNERS similarity index 100% rename from pkg/kubectl/cmd/auth/OWNERS rename to staging/src/k8s.io/kubectl/pkg/cmd/auth/OWNERS diff --git a/pkg/kubectl/cmd/auth/auth.go b/staging/src/k8s.io/kubectl/pkg/cmd/auth/auth.go similarity index 100% rename from pkg/kubectl/cmd/auth/auth.go rename to staging/src/k8s.io/kubectl/pkg/cmd/auth/auth.go diff --git a/pkg/kubectl/cmd/auth/cani.go b/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani.go similarity index 100% rename from pkg/kubectl/cmd/auth/cani.go rename to staging/src/k8s.io/kubectl/pkg/cmd/auth/cani.go diff --git a/pkg/kubectl/cmd/auth/cani_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go similarity index 100% rename from pkg/kubectl/cmd/auth/cani_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/auth/cani_test.go diff --git a/pkg/kubectl/cmd/auth/reconcile.go b/staging/src/k8s.io/kubectl/pkg/cmd/auth/reconcile.go similarity index 100% rename from pkg/kubectl/cmd/auth/reconcile.go rename to staging/src/k8s.io/kubectl/pkg/cmd/auth/reconcile.go diff --git a/vendor/modules.txt b/vendor/modules.txt index e7e9d0601c9..8dbb09d9b12 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2312,6 +2312,7 @@ k8s.io/kubectl/pkg/cmd/annotate k8s.io/kubectl/pkg/cmd/apiresources k8s.io/kubectl/pkg/cmd/apply k8s.io/kubectl/pkg/cmd/attach +k8s.io/kubectl/pkg/cmd/auth k8s.io/kubectl/pkg/cmd/autoscale k8s.io/kubectl/pkg/cmd/certificates k8s.io/kubectl/pkg/cmd/clusterinfo