fix(labelsMatchExpressions): reintroduce support for instanceSelector…

…: {}
grafana · May 16, 2024 · ea373ea · ea373ea
1 parent f44b828
commit ea373ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/controllers/controller_shared.go b/controllers/controller_shared.go
@@ -49,8 +49,9 @@ func GetMatchingInstances(ctx context.Context, k8sClient client.Client, labelSel
 }
 
 func labelsSatisfyMatchExpressions(labels map[string]string, matchExpressions []metav1.LabelSelectorRequirement) bool {
+	// To preserve support for scenario with instanceSelector: {}
 	if len(labels) == 0 {
-		return false
+		return true
 	}
 
 	if len(matchExpressions) == 0 {

diff --git a/controllers/controller_shared_test.go b/controllers/controller_shared_test.go
@@ -34,7 +34,7 @@ func TestLabelsSatisfyMatchExpressions(t *testing.T) {
 			name:             "No labels and no expressions",
 			labels:           map[string]string{},
 			matchExpressions: []metav1.LabelSelectorRequirement{},
-			want:             false,
+			want:             true,
 		},
 		{
 			name:   "No labels",
@@ -45,7 +45,7 @@ func TestLabelsSatisfyMatchExpressions(t *testing.T) {
 					Key:      "dashboards",
 				},
 			},
-			want: false,
+			want: true,
 		},
 		{
 			name: "No matchExpressions",