♻️ Clean up label query logic

clevyr · Apr 21, 2022 · 9742529 · 9742529
1 parent 5ff604a
commit 9742529
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/internal/kubernetes/label_query_and.go b/internal/kubernetes/label_query_and.go
@@ -9,25 +9,16 @@ type LabelQueryAnd []LabelQuery
 
 func (queries LabelQueryAnd) Matches(pod v1.Pod) bool {
 	for _, query := range queries {
-		if query.Matches(pod) {
-			return true
+		if !query.Matches(pod) {
+			return false
 		}
 	}
-	return false
+	return true
 }
 
 func (queries LabelQueryAnd) FindPods(list *v1.PodList) (pods []v1.Pod, err error) {
 	for _, pod := range list.Items {
-		var match bool
-		for _, query := range queries {
-			if query.Matches(pod) {
-				match = true
-			} else {
-				match = false
-				break
-			}
-		}
-		if match {
+		if queries.Matches(pod) {
 			pods = append(pods, pod)
 		}
 	}