diff --git a/staging/src/k8s.io/component-base/metrics/opts.go b/staging/src/k8s.io/component-base/metrics/opts.go index 1633a8558ce..4f69b2611e0 100644 --- a/staging/src/k8s.io/component-base/metrics/opts.go +++ b/staging/src/k8s.io/component-base/metrics/opts.go @@ -315,7 +315,7 @@ func (o *SummaryOpts) toPromSummaryOpts() prometheus.SummaryOpts { } type MetricLabelAllowList struct { - labelToAllowList map[string]sets.String + labelToAllowList map[string]sets.Set[string] } func (allowList *MetricLabelAllowList) ConstrainToAllowedList(labelNameList, labelValueList []string) { @@ -347,13 +347,13 @@ func SetLabelAllowListFromCLI(allowListMapping map[string]string) { for metricLabelName, labelValues := range allowListMapping { metricName := strings.Split(metricLabelName, ",")[0] labelName := strings.Split(metricLabelName, ",")[1] - valueSet := sets.NewString(strings.Split(labelValues, ",")...) + valueSet := sets.New[string](strings.Split(labelValues, ",")...) allowList, ok := labelValueAllowLists[metricName] if ok { allowList.labelToAllowList[labelName] = valueSet } else { - labelToAllowList := make(map[string]sets.String) + labelToAllowList := make(map[string]sets.Set[string]) labelToAllowList[labelName] = valueSet labelValueAllowLists[metricName] = &MetricLabelAllowList{ labelToAllowList, diff --git a/staging/src/k8s.io/component-base/metrics/opts_test.go b/staging/src/k8s.io/component-base/metrics/opts_test.go index eb61a6fbd1d..b2e0fb0295c 100644 --- a/staging/src/k8s.io/component-base/metrics/opts_test.go +++ b/staging/src/k8s.io/component-base/metrics/opts_test.go @@ -65,8 +65,8 @@ func TestDefaultStabilityLevel(t *testing.T) { func TestConstrainToAllowedList(t *testing.T) { allowList := &MetricLabelAllowList{ - labelToAllowList: map[string]sets.String{ - "label_a": sets.NewString("allow_value1", "allow_value2"), + labelToAllowList: map[string]sets.Set[string]{ + "label_a": sets.New[string]("allow_value1", "allow_value2"), }, } labelNameList := []string{"label_a", "label_b"} @@ -98,8 +98,8 @@ func TestConstrainToAllowedList(t *testing.T) { func TestConstrainLabelMap(t *testing.T) { allowList := &MetricLabelAllowList{ - labelToAllowList: map[string]sets.String{ - "label_a": sets.NewString("allow_value1", "allow_value2"), + labelToAllowList: map[string]sets.Set[string]{ + "label_a": sets.New[string]("allow_value1", "allow_value2"), }, } var tests = []struct { @@ -154,13 +154,13 @@ func TestSetLabelAllowListFromManifest(t *testing.T) { metric2,label2: v3`, expectlabelValueAllowLists: map[string]*MetricLabelAllowList{ "metric1": { - labelToAllowList: map[string]sets.String{ - "label1": sets.NewString("v1", "v2"), + labelToAllowList: map[string]sets.Set[string]{ + "label1": sets.New[string]("v1", "v2"), }, }, "metric2": { - labelToAllowList: map[string]sets.String{ - "label2": sets.NewString("v3"), + labelToAllowList: map[string]sets.Set[string]{ + "label2": sets.New[string]("v3"), }, }, },