Merge pull request #96145 from ingvagabund/move-pkg-kubectl-cmd-auth-under-kubectl-staging

Move pkg/kubectl/cmd/auth under staging/src/k8s.io/kubectl/pkg/cmd/auth

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",

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",
     ],

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"

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

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

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
 )

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",

staging/src/k8s.io/kubectl/pkg/cmd/auth/BUILD

@@ -1,8 +1,4 @@
-load(
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-    "@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",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/auth",
-    visibility = [
+    importpath = "k8s.io/kubectl/pkg/cmd/auth",
-        "//build/visible_to:pkg_kubectl_cmd_auth_CONSUMERS",
+    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"],
+)

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