Skip to content

Commit 450a853

Browse files
authored
Merge pull request #97 from DataDog/david.benque/label-filter-fix
fix label key expression formating
2 parents d92f02b + 231ab8c commit 450a853

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

internal/kubernetes/nodefilters.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func ConvertLabelsToFilterExpr(labels map[string]string) *string {
122122
if k != "" && labels[k] == "" {
123123
res = append(res, fmt.Sprintf(`'%s' in metadata.labels`, k))
124124
} else {
125-
res = append(res, fmt.Sprintf(`metadata.labels.%s == '%s'`, k, labels[k]))
125+
res = append(res, fmt.Sprintf(`metadata.labels['%s'] == '%s'`, k, labels[k]))
126126
}
127127
}
128128
temp := strings.Join(res, " && ")

internal/kubernetes/nodefilters_test.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,17 @@ func TestOldNodeLabelFilter(t *testing.T) {
234234
labels: map[string]string{"cool": "very"},
235235
passesFilter: true,
236236
},
237+
{
238+
name: "SingleMatchingLabel.WithDomain",
239+
obj: &core.Node{
240+
ObjectMeta: meta.ObjectMeta{
241+
Name: nodeName,
242+
Labels: map[string]string{"planetlabs.com/cool": "very"},
243+
},
244+
},
245+
labels: map[string]string{"planetlabs.com/cool": "very"},
246+
passesFilter: true,
247+
},
237248
{
238249
name: "ManyMatchingLabels",
239250
obj: &core.Node{
@@ -431,7 +442,7 @@ func TestConvertLabelsToFilterExpr(t *testing.T) {
431442
"sup": "cool",
432443
}
433444

434-
desired := "metadata.labels.foo == 'bar' && metadata.labels.sup == 'cool'"
445+
desired := "metadata.labels['foo'] == 'bar' && metadata.labels['sup'] == 'cool'"
435446
actual := ConvertLabelsToFilterExpr(input)
436447

437448
assert.Equal(t, desired, *actual)

0 commit comments

Comments
 (0)