Downgrade Kubernetes vendor version

Multus community decide that multus support the Kubernetes that
Kubernetes community supports, so changed vendor code to the
oldest version of currently supported.

vendor/k8s.io/component-base/metrics/options.go

@@ -18,7 +18,6 @@ package metrics
 
 import (
 	"fmt"
-	"regexp"
 
 	"github.com/blang/semver"
 	"github.com/spf13/pflag"
@@ -29,8 +28,6 @@ import (
 // Options has all parameters needed for exposing metrics from components
 type Options struct {
 	ShowHiddenMetricsForVersion string
-	DisabledMetrics             []string
-	AllowListMapping            map[string]string
 }
 
 // NewOptions returns default metrics options
@@ -40,20 +37,12 @@ func NewOptions() *Options {
 
 // Validate validates metrics flags options.
 func (o *Options) Validate() []error {
-	var errs []error
 	err := validateShowHiddenMetricsVersion(parseVersion(version.Get()), o.ShowHiddenMetricsForVersion)
 	if err != nil {
-		errs = append(errs, err)
+		return []error{err}
 	}
 
-	if err := validateAllowMetricLabel(o.AllowListMapping); err != nil {
-		errs = append(errs, err)
-	}
-
-	if len(errs) == 0 {
-		return nil
-	}
-	return errs
+	return nil
 }
 
 // AddFlags adds flags for exposing component metrics.
@@ -67,33 +56,13 @@ func (o *Options) AddFlags(fs *pflag.FlagSet) {
 			"The format is <major>.<minor>, e.g.: '1.16'. "+
 			"The purpose of this format is make sure you have the opportunity to notice if the next release hides additional metrics, "+
 			"rather than being surprised when they are permanently removed in the release after that.")
-	fs.StringSliceVar(&o.DisabledMetrics,
-		"disabled-metrics",
-		o.DisabledMetrics,
-		"This flag provides an escape hatch for misbehaving metrics. "+
-			"You must provide the fully qualified metric name in order to disable it. "+
-			"Disclaimer: disabling metrics is higher in precedence than showing hidden metrics.")
-	fs.StringToStringVar(&o.AllowListMapping, "allow-metric-labels", o.AllowListMapping,
-		"The map from metric-label to value allow-list of this label. The key's format is <MetricName>,<LabelName>. "+
-			"The value's format is <allowed_value>,<allowed_value>..."+
-			"e.g. metric1,label1='v1,v2,v3', metric1,label2='v1,v2,v3' metric2,label1='v1,v2,v3'.")
 }
 
 // Apply applies parameters into global configuration of metrics.
 func (o *Options) Apply() {
-	if o == nil {
-		return
-	}
-	if len(o.ShowHiddenMetricsForVersion) > 0 {
+	if o != nil && len(o.ShowHiddenMetricsForVersion) > 0 {
 		SetShowHidden()
 	}
-	// set disabled metrics
-	for _, metricName := range o.DisabledMetrics {
-		SetDisabledMetric(metricName)
-	}
-	if o.AllowListMapping != nil {
-		SetLabelAllowListFromCLI(o.AllowListMapping)
-	}
 }
 
 func validateShowHiddenMetricsVersion(currentVersion semver.Version, targetVersionStr string) error {
@@ -108,18 +77,3 @@ func validateShowHiddenMetricsVersion(currentVersion semver.Version, targetVersi
 
 	return nil
 }
-
-func validateAllowMetricLabel(allowListMapping map[string]string) error {
-	if allowListMapping == nil {
-		return nil
-	}
-	metricNameRegex := `[a-zA-Z_:][a-zA-Z0-9_:]*`
-	labelRegex := `[a-zA-Z_][a-zA-Z0-9_]*`
-	for k := range allowListMapping {
-		reg := regexp.MustCompile(metricNameRegex + `,` + labelRegex)
-		if reg.FindString(k) != k {
-			return fmt.Errorf("--allow-metric-labels must has a list of kv pair with format `metricName:labelName=labelValue, labelValue,...`")
-		}
-	}
-	return nil
-}