Merge pull request #79185 from seans3/move-kubectl-util

Move pkg/kubectl/util/certificate to staging

pkg/kubectl/describe/versioned/BUILD

@@ -8,7 +8,6 @@ go_library(
     deps = [
         "//pkg/kubectl/describe:go_default_library",
         "//pkg/kubectl/scheme:go_default_library",
-        "//pkg/kubectl/util/certificate:go_default_library",
         "//pkg/kubectl/util/fieldpath:go_default_library",
         "//pkg/kubectl/util/slice:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
@@ -42,6 +41,7 @@ go_library(
         "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/tools/reference:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/util/certificate:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/event:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/qos:go_default_library",

pkg/kubectl/describe/versioned/describe.go

@@ -65,6 +65,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/reference"
 	"k8s.io/klog"
+	"k8s.io/kubectl/pkg/util/certificate"
 	deploymentutil "k8s.io/kubectl/pkg/util/deployment"
 	"k8s.io/kubectl/pkg/util/event"
 	"k8s.io/kubectl/pkg/util/qos"
@@ -73,7 +74,6 @@ import (
 	storageutil "k8s.io/kubectl/pkg/util/storage"
 	"k8s.io/kubernetes/pkg/kubectl/describe"
 	"k8s.io/kubernetes/pkg/kubectl/scheme"
-	"k8s.io/kubernetes/pkg/kubectl/util/certificate"
 	"k8s.io/kubernetes/pkg/kubectl/util/fieldpath"
 	"k8s.io/kubernetes/pkg/kubectl/util/slice"
 )

pkg/kubectl/util/BUILD

@@ -66,7 +66,6 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/kubectl/util/certificate:all-srcs",
         "//pkg/kubectl/util/fieldpath:all-srcs",
         "//pkg/kubectl/util/i18n:all-srcs",
         "//pkg/kubectl/util/logs:all-srcs",

staging/src/k8s.io/kubectl/BUILD

@@ -9,6 +9,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/util/certificate:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/deployment:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/event:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/hash:all-srcs",

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

@@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["certificate.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/util/certificate",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/certificate",
+    importpath = "k8s.io/kubectl/pkg/util/certificate",
     visibility = ["//visibility:public"],
     deps = ["//staging/src/k8s.io/api/certificates/v1beta1:go_default_library"],
 )

vendor/modules.txt

@@ -1636,6 +1636,7 @@ k8s.io/kube-proxy/config/v1alpha1
 # k8s.io/kube-scheduler v0.0.0 => ./staging/src/k8s.io/kube-scheduler
 k8s.io/kube-scheduler/config/v1alpha1
 # k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl
+k8s.io/kubectl/pkg/util/certificate
 k8s.io/kubectl/pkg/util/deployment
 k8s.io/kubectl/pkg/util/event
 k8s.io/kubectl/pkg/util/hash