Maksytka/kind
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kind.git synced 2025-12-01 07:26:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

remove long-deprecated --loglevel flag

Browse Source
This commit is contained in:
Benjamin Elder
2024-08-16 13:03:00 -07:00
parent 30ce8ddb09
commit f890ce8c9f
1 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/cmd/kind/root.go
View File

@@ -35,7 +35,6 @@ import (
)
type flagpole struct {
LogLevel string
Verbosity int32
Quiet bool
}
@@ -49,7 +48,7 @@ func NewCommand(logger log.Logger, streams cmd.IOStreams) *cobra.Command {
Short: "kind is a tool for managing local Kubernetes clusters",
Long: "kind creates and manages local Kubernetes clusters using Docker container 'nodes'",
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
return runE(logger, flags, cmd)
return runE(logger, flags)
},
SilenceUsage: true,
SilenceErrors: true,
@@ -57,12 +56,6 @@ func NewCommand(logger log.Logger, streams cmd.IOStreams) *cobra.Command {
}
cmd.SetOut(streams.Out)
cmd.SetErr(streams.ErrOut)
cmd.PersistentFlags().StringVar(
&flags.LogLevel,
"loglevel",
"",
"DEPRECATED: see -v instead",
)
cmd.PersistentFlags().Int32VarP(
&flags.Verbosity,
"verbosity",
@@ -89,18 +82,7 @@ func NewCommand(logger log.Logger, streams cmd.IOStreams) *cobra.Command {
return cmd
}
func runE(logger log.Logger, flags *flagpole, command *cobra.Command) error {
// handle limited migration for --loglevel
setLogLevel := command.Flag("loglevel").Changed
setVerbosity := command.Flag("verbosity").Changed
if setLogLevel && !setVerbosity {
switch flags.LogLevel {
case "debug":
flags.Verbosity = 3
case "trace":
flags.Verbosity = 2147483647
}
}
func runE(logger log.Logger, flags *flagpole) error {
// normal logger setup
if flags.Quiet {
// NOTE: if we are coming from app.Run handling this flag is
@@ -108,14 +90,6 @@ func runE(logger log.Logger, flags *flagpole, command *cobra.Command) error {
maybeSetWriter(logger, io.Discard)
}
maybeSetVerbosity(logger, log.Level(flags.Verbosity))
// warn about deprecated flag if used
if setLogLevel {
if cmd.ColorEnabled(logger) {
logger.Warn("\x1b[93mWARNING\x1b[0m: --loglevel is deprecated, please switch to -v and -q!")
} else {
logger.Warn("WARNING: --loglevel is deprecated, please switch to -v and -q!")
}
}
return nil
}