fixup! fixup! fixup! fixup! Allow labelFromKey field

kubernetes · Nov 9, 2022 · 3072502 · 3072502
1 parent b9f0d8d
commit 3072502
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pkg/customresourcestate/registry_factory.go b/pkg/customresourcestate/registry_factory.go
@@ -214,6 +214,10 @@ func (c *compiledGauge) Values(v interface{}) (result []eachValue, errs []error)
 				onError(fmt.Errorf("[%s]: %w", key, err))
 				continue
 			}
+			if _, ok := ev.Labels[c.labelFromKey]; ok {
+				onError(fmt.Errorf("labelFromKey (%s) generated labels conflict with labelsFromPath, consider renaming it", c.labelFromKey))
+				continue
+			}
 			if key != "" && c.labelFromKey != "" {
 				ev.Labels[c.labelFromKey] = key
 			}
@@ -285,9 +289,7 @@ func (c *compiledInfo) Values(v interface{}) (result []eachValue, errs []error)
 				})
 			}
 		}
-		if len(result) == 0 {
-			result = value
-		}
+		result = append(result, value...)
 	default:
 		result, errs = c.values(v)
 	}
@@ -301,7 +303,9 @@ func (c *compiledInfo) values(v interface{}) (result []eachValue, err []error) {
 	}
 	value := eachValue{Value: 1, Labels: map[string]string{}}
 	addPathLabels(v, c.labelFromPath, value.Labels)
-	result = append(result, value)
+	if len(value.Labels) != 0 {
+		result = append(result, value)
+	}
 	return
 }
 

diff --git a/pkg/customresourcestate/registry_factory_test.go b/pkg/customresourcestate/registry_factory_test.go
@@ -221,7 +221,7 @@ func Test_values(t *testing.T) {
 			labelFromKey: "type",
 		}, wantResult: []eachValue{
 			newEachValue(t, 1, "type", "type-a"),
-			newEachValue(t, 3, "type", "type-b"),
+			newEachValue(t, 1, "type", "type-b"),
 		}},
 		{name: "stateset", each: &compiledStateSet{
 			compiledCommon: compiledCommon{