From 2621e6a0d61fccdb50df3ec90a84de4ebc3b5de5 Mon Sep 17 00:00:00 2001
From: Sean Sullivan <seans@google.com>
Date: Fri, 2 Aug 2019 11:46:13 -0700
Subject: [PATCH] Unexport kubectl cmd profiling

---
 hack/.golint_failures                                       | 1 -
 pkg/kubectl/cmd/BUILD                                       | 6 +++++-
 pkg/kubectl/cmd/cmd.go                                      | 6 +++---
 .../src/k8s.io/kubectl/pkg => pkg/kubectl}/cmd/profiling.go | 6 +++---
 staging/src/k8s.io/kubectl/pkg/cmd/BUILD                    | 6 +-----
 5 files changed, 12 insertions(+), 13 deletions(-)
 rename {staging/src/k8s.io/kubectl/pkg => pkg/kubectl}/cmd/profiling.go (94%)

diff --git a/hack/.golint_failures b/hack/.golint_failures
index 36cbddc263b..2d9dbd53c6a 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -502,7 +502,6 @@ staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1
 staging/src/k8s.io/kube-aggregator/pkg/apiserver
 staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister
 staging/src/k8s.io/kube-proxy/config/v1alpha1
-staging/src/k8s.io/kubectl/pkg/cmd
 staging/src/k8s.io/kubectl/pkg/cmd/annotate
 staging/src/k8s.io/kubectl/pkg/cmd/apply
 staging/src/k8s.io/kubectl/pkg/cmd/attach
diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD
index 853b55cf1e9..39f56ecef2d 100644
--- a/pkg/kubectl/cmd/BUILD
+++ b/pkg/kubectl/cmd/BUILD
@@ -2,7 +2,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = ["cmd.go"],
+    srcs = [
+        "cmd.go",
+        "profiling.go",
+    ],
     importpath = "k8s.io/kubernetes/pkg/kubectl/cmd",
     visibility = ["//visibility:public"],
     deps = [
@@ -54,6 +57,7 @@ go_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",
+        "//vendor/github.com/spf13/pflag:go_default_library",
     ],
 )
 
diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go
index 983515088a0..47df5729bdc 100644
--- a/pkg/kubectl/cmd/cmd.go
+++ b/pkg/kubectl/cmd/cmd.go
@@ -446,10 +446,10 @@ func NewKubectlCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 		// Hook before and after Run initialize and write profiles to disk,
 		// respectively.
 		PersistentPreRunE: func(*cobra.Command, []string) error {
-			return cmdpkg.InitProfiling()
+			return initProfiling()
 		},
 		PersistentPostRunE: func(*cobra.Command, []string) error {
-			return cmdpkg.FlushProfiling()
+			return flushProfiling()
 		},
 		BashCompletionFunction: bashCompletionFunc,
 	}
@@ -461,7 +461,7 @@ func NewKubectlCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 	// a.k.a. change all "_" to "-". e.g. glog package
 	flags.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
 
-	cmdpkg.AddProfilingFlags(flags)
+	addProfilingFlags(flags)
 
 	kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
 	kubeConfigFlags.AddFlags(flags)
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go b/pkg/kubectl/cmd/profiling.go
similarity index 94%
rename from staging/src/k8s.io/kubectl/pkg/cmd/profiling.go
rename to pkg/kubectl/cmd/profiling.go
index e1309835d21..2a1c1ce3c15 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go
+++ b/pkg/kubectl/cmd/profiling.go
@@ -30,12 +30,12 @@ var (
 	profileOutput string
 )
 
-func AddProfilingFlags(flags *pflag.FlagSet) {
+func addProfilingFlags(flags *pflag.FlagSet) {
 	flags.StringVar(&profileName, "profile", "none", "Name of profile to capture. One of (none|cpu|heap|goroutine|threadcreate|block|mutex)")
 	flags.StringVar(&profileOutput, "profile-output", "profile.pprof", "Name of the file to write the profile to")
 }
 
-func InitProfiling() error {
+func initProfiling() error {
 	switch profileName {
 	case "none":
 		return nil
@@ -63,7 +63,7 @@ func InitProfiling() error {
 	return nil
 }
 
-func FlushProfiling() error {
+func flushProfiling() error {
 	switch profileName {
 	case "none":
 		return nil
diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD
index 90b67c34de0..cb806ec9ea9 100644
--- a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD
@@ -2,10 +2,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "go_default_library",
-    srcs = [
-        "alpha.go",
-        "profiling.go",
-    ],
+    srcs = ["alpha.go"],
     importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd",
     importpath = "k8s.io/kubectl/pkg/cmd",
     visibility = [
@@ -17,7 +14,6 @@ go_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",
-        "//vendor/github.com/spf13/pflag:go_default_library",
     ],
 )