Merge pull request #106391 from Huang-Wei/automated-cherry-pick-of-#1…

…05065-upstream-release-1.21 Automated cherry pick of #105065: parameter 'disabled-metrics' is invalid
kubernetes · Nov 13, 2021 · 5e5a50f · 5e5a50f
2 parents a797974 + 20949a3
commit 5e5a50f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/staging/src/k8s.io/component-base/metrics/options.go b/staging/src/k8s.io/component-base/metrics/options.go
@@ -58,8 +58,8 @@ func (o *Options) Validate() []error {
 
 // AddFlags adds flags for exposing component metrics.
 func (o *Options) AddFlags(fs *pflag.FlagSet) {
-	if o != nil {
-		o = NewOptions()
+	if o == nil {
+		return
 	}
 	fs.StringVar(&o.ShowHiddenMetricsForVersion, "show-hidden-metrics-for-version", o.ShowHiddenMetricsForVersion,
 		"The previous version for which you want to show hidden metrics. "+