Skip to content

Commit d1e2f41

Browse files
authored
add a nil check for Watch Selector field (#164)
* add a nil check for Watch Selector field Signed-off-by: Bryce Palmer <[email protected]> * update watches_test Signed-off-by: Bryce Palmer <[email protected]>
1 parent 7a3e61f commit d1e2f41

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

pkg/watches/watches.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ func LoadReader(reader io.Reader) ([]Watch, error) {
9898
w.WatchDependentResources = &trueVal
9999
}
100100

101+
if w.Selector == nil {
102+
w.Selector = &metav1.LabelSelector{}
103+
}
104+
101105
w.OverrideValues, err = expandOverrideValues(w.OverrideValues)
102106
if err != nil {
103107
return nil, fmt.Errorf("failed to expand override values")

pkg/watches/watches_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,11 @@ func verifyEqualWatches(expectedWatch, obtainedWatch []Watch) {
340340
Expect(expectedWatch[i].OverrideValues).To(BeEquivalentTo(obtainedWatch[i].OverrideValues))
341341
Expect(expectedWatch[i].MaxConcurrentReconciles).To(BeEquivalentTo(obtainedWatch[i].MaxConcurrentReconciles))
342342
Expect(expectedWatch[i].ReconcilePeriod).To(BeEquivalentTo(obtainedWatch[i].ReconcilePeriod))
343-
Expect(expectedWatch[i].Selector).To(BeEquivalentTo(obtainedWatch[i].Selector))
343+
if expectedWatch[i].Selector == nil {
344+
Expect(&v1.LabelSelector{}).To(BeEquivalentTo(obtainedWatch[i].Selector))
345+
} else {
346+
Expect(expectedWatch[i].Selector).To(BeEquivalentTo(obtainedWatch[i].Selector))
347+
}
344348
}
345349
}
346350

0 commit comments

Comments
 (0)