Unexport kubectl cmd profiling

This commit is contained in:
Sean Sullivan 2019-08-02 11:46:13 -07:00
parent 42d7feee28
commit 2621e6a0d6
5 changed files with 12 additions and 13 deletions

View File

@ -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/apiserver
staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister
staging/src/k8s.io/kube-proxy/config/v1alpha1 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/annotate
staging/src/k8s.io/kubectl/pkg/cmd/apply staging/src/k8s.io/kubectl/pkg/cmd/apply
staging/src/k8s.io/kubectl/pkg/cmd/attach staging/src/k8s.io/kubectl/pkg/cmd/attach

View File

@ -2,7 +2,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
srcs = ["cmd.go"], srcs = [
"cmd.go",
"profiling.go",
],
importpath = "k8s.io/kubernetes/pkg/kubectl/cmd", importpath = "k8s.io/kubernetes/pkg/kubectl/cmd",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ 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/i18n:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/templates: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/cobra:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
], ],
) )

View File

@ -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, // Hook before and after Run initialize and write profiles to disk,
// respectively. // respectively.
PersistentPreRunE: func(*cobra.Command, []string) error { PersistentPreRunE: func(*cobra.Command, []string) error {
return cmdpkg.InitProfiling() return initProfiling()
}, },
PersistentPostRunE: func(*cobra.Command, []string) error { PersistentPostRunE: func(*cobra.Command, []string) error {
return cmdpkg.FlushProfiling() return flushProfiling()
}, },
BashCompletionFunction: bashCompletionFunc, 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 // a.k.a. change all "_" to "-". e.g. glog package
flags.SetNormalizeFunc(cliflag.WordSepNormalizeFunc) flags.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
cmdpkg.AddProfilingFlags(flags) addProfilingFlags(flags)
kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag() kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
kubeConfigFlags.AddFlags(flags) kubeConfigFlags.AddFlags(flags)

View File

@ -30,12 +30,12 @@ var (
profileOutput string 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(&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") flags.StringVar(&profileOutput, "profile-output", "profile.pprof", "Name of the file to write the profile to")
} }
func InitProfiling() error { func initProfiling() error {
switch profileName { switch profileName {
case "none": case "none":
return nil return nil
@ -63,7 +63,7 @@ func InitProfiling() error {
return nil return nil
} }
func FlushProfiling() error { func flushProfiling() error {
switch profileName { switch profileName {
case "none": case "none":
return nil return nil

View File

@ -2,10 +2,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
srcs = [ srcs = ["alpha.go"],
"alpha.go",
"profiling.go",
],
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd", importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd",
importpath = "k8s.io/kubectl/pkg/cmd", importpath = "k8s.io/kubectl/pkg/cmd",
visibility = [ 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/i18n:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/util/templates: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/cobra:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
], ],
) )