Update staging/src/k8s.io/component-base/logs/options.go

serathius · lavalamp · web-flow · commit 5114dac5a441 · 2020-06-19T17:57:55.000+02:00
Co-authored-by: Daniel Smith &lt;dbsmith@google.com&gt;
diff --git a/staging/src/k8s.io/component-base/logs/options.go b/staging/src/k8s.io/component-base/logs/options.go
@@ -62,7 +62,7 @@ func (o *Options) Validate() []error {
 func (o *Options) AddFlags(fs *pflag.FlagSet) {
 	unsupportedFlags := fmt.Sprintf("--%s", strings.Join(unsupportedLoggingFlags(), ", --"))
 	formats := fmt.Sprintf(`"%s"`, strings.Join(logRegistry.List(), `", "`))
-	fs.StringVar(&o.LogFormat, logFormatFlagName, defaultLogFormat, fmt.Sprintf("Set format of logs written by component. Options: %s. Non default formats don't support klog flags like: %s.", formats, unsupportedFlags))
+	fs.StringVar(&o.LogFormat, logFormatFlagName, defaultLogFormat, fmt.Sprintf("Sets the log format. Permitted formats: %s.\nNon-default formats don't honor these flags: %s.\nNon-default choices are currently alpha and subject to change without warning.", formats, unsupportedFlags))
 }
 
 // Apply set klog logger from LogFormat type

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (o *Options) Validate() []error {`
`62`	`62`	`func (o Options) AddFlags(fs pflag.FlagSet) {`
`63`	`63`	`unsupportedFlags := fmt.Sprintf("--%s", strings.Join(unsupportedLoggingFlags(), ", --"))`
`64`	`64`	formats := fmt.Sprintf(`"%s"`, strings.Join(logRegistry.List(), `", "`))
`65`		`- fs.StringVar(&o.LogFormat, logFormatFlagName, defaultLogFormat, fmt.Sprintf("Set format of logs written by component. Options: %s. Non default formats don't support klog flags like: %s.", formats, unsupportedFlags))`
	`65`	`+ fs.StringVar(&o.LogFormat, logFormatFlagName, defaultLogFormat, fmt.Sprintf("Sets the log format. Permitted formats: %s.\nNon-default formats don't honor these flags: %s.\nNon-default choices are currently alpha and subject to change without warning.", formats, unsupportedFlags))`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`// Apply set klog logger from LogFormat type`