Merge pull request #2007 from rexagod/fix-label-resolution-maps

k8s-ci-robot · web-flow · commit 3a7e617949cd · 2023-02-23T09:47:35.000-08:00
Fix label resolution for maps
diff --git a/pkg/customresourcestate/registry_factory.go b/pkg/customresourcestate/registry_factory.go
@@ -264,6 +264,8 @@ func (c *compiledGauge) Values(v interface{}) (result []eachValue, errs []error)
 				ev.Labels[c.labelFromKey] = key
 			}
 			addPathLabels(it, c.LabelFromPath(), ev.Labels)
+			// Evaluate path from parent's context as well (search w.r.t. the root element, not just specific fields).
+			addPathLabels(v, c.LabelFromPath(), ev.Labels)
 			result = append(result, *ev)
 		}
 	case []interface{}:
diff --git a/pkg/customresourcestate/registry_factory_test.go b/pkg/customresourcestate/registry_factory_test.go
@@ -193,7 +193,7 @@ func Test_values(t *testing.T) {
 			},
 			ValueFrom: mustCompilePath(t, "creationTimestamp"),
 		}, wantResult: []eachValue{
-			newEachValue(t, 1.6563744e+09),
+			newEachValue(t, 1.6563744e+09, "name", "foo"),
 		}},
 		{name: "non-existent path", each: &compiledGauge{
 			compiledCommon: compiledCommon{

Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,8 @@ func (c *compiledGauge) Values(v interface{}) (result []eachValue, errs []error)`
`264`	`264`	`ev.Labels[c.labelFromKey] = key`
`265`	`265`	`}`
`266`	`266`	`addPathLabels(it, c.LabelFromPath(), ev.Labels)`
	`267`	`+ // Evaluate path from parent's context as well (search w.r.t. the root element, not just specific fields).`
	`268`	`+ addPathLabels(v, c.LabelFromPath(), ev.Labels)`
`267`	`269`	`result = append(result, *ev)`
`268`	`270`	`}`
`269`	`271`	`case []interface{}:`