Update validatingwebhookconfiguration

internal/store/builder.go

@@ -470,7 +470,7 @@ func (b *Builder) buildCsrStores() []cache.Store {
 }
 
 func (b *Builder) buildValidatingWebhookConfigurationStores() []cache.Store {
-	return b.buildStoresFunc(validatingWebhookConfigurationMetricFamilies, &admissionregistrationv1.ValidatingWebhookConfiguration{}, createValidatingWebhookConfigurationListWatch, b.useAPIServerCache)
+	return b.buildStoresFunc(validatingWebhookConfigurationMetricFamilies(), &admissionregistrationv1.ValidatingWebhookConfiguration{}, createValidatingWebhookConfigurationListWatch, b.useAPIServerCache)
 }
 
 func (b *Builder) buildVolumeAttachmentStores() []cache.Store {

internal/store/validatingwebhookconfiguration.go

@@ -33,22 +33,28 @@ import (
 
 var (
 	descValidatingWebhookConfigurationDefaultLabels = []string{"namespace", "validatingwebhookconfiguration"}
+)
 
-	validatingWebhookConfigurationMetricFamilies = []generator.FamilyGenerator{
+func validatingWebhookConfigurationMetricFamilies() []generator.FamilyGenerator {
+	return []generator.FamilyGenerator{
 		*generator.NewFamilyGeneratorWithStability(
 			"kube_validatingwebhookconfiguration_info",
 			"Information about the ValidatingWebhookConfiguration.",
 			metric.Gauge,
 			basemetrics.ALPHA,
 			"",
 			wrapValidatingWebhookConfigurationFunc(func(vwc *admissionregistrationv1.ValidatingWebhookConfiguration) *metric.Family {
-				return &metric.Family{
-					Metrics: []*metric.Metric{
-						{
-							Value: 1,
-						},
+				ms := []*metric.Metric{
+					{
+						Value: 1,
 					},
 				}
+
+				metric.SetLabelKeys(ms, []string{})
+
+				return &metric.Family{
+					Metrics: ms,
+				}
 			}),
 		),
 		*generator.NewFamilyGeneratorWithStability(
@@ -65,6 +71,9 @@ var (
 						Value: float64(vwc.CreationTimestamp.Unix()),
 					})
 				}
+
+				metric.SetLabelKeys(ms, []string{})
+
 				return &metric.Family{
 					Metrics: ms,
 				}
@@ -98,18 +107,20 @@ var (
 					}
 
 					ms = append(ms, &metric.Metric{
-						LabelKeys:   []string{"webhook_name", "service_name", "service_namespace"},
 						LabelValues: []string{webhook.Name, serviceName, serviceNamespace},
 						Value:       1,
 					})
 				}
+
+				metric.SetLabelKeys(ms, []string{"webhook_name", "service_name", "service_namespace"})
+
 				return &metric.Family{
 					Metrics: ms,
 				}
 			}),
 		),
 	}
-)
+}
 
 func createValidatingWebhookConfigurationListWatch(kubeClient clientset.Interface, _ string, _ string) cache.ListerWatcher {
 	return &cache.ListWatch{

internal/store/validatingwebhookconfiguration_test.go

@@ -103,8 +103,8 @@ func TestValidatingWebhookConfigurationStore(t *testing.T) {
 		},
 	}
 	for i, c := range cases {
-		c.Func = generator.ComposeMetricGenFuncs(validatingWebhookConfigurationMetricFamilies)
-		c.Headers = generator.ExtractMetricFamilyHeaders(validatingWebhookConfigurationMetricFamilies)
+		c.Func = generator.ComposeMetricGenFuncs(validatingWebhookConfigurationMetricFamilies())
+		c.Headers = generator.ExtractMetricFamilyHeaders(validatingWebhookConfigurationMetricFamilies())
 		if err := c.run(); err != nil {
 			t.Errorf("unexpected collecting result in %vth run:\n%s", i, err)
 		}