1

Signed-off-by: Manuel de Brito Fontes <[email protected]>

Author: aledbf

components/node-labeler/cmd/run.go

@@ -80,29 +80,20 @@ var runCmd = &cobra.Command{
 			client,
 		}
 
-		rfPredicate, err := predicate.LabelSelectorPredicate(metav1.LabelSelector{
-			MatchLabels: map[string]string{
-				"app":       "gitpod",
-				"component": "registry-facade",
-			},
-		})
-		if err != nil {
-			log.WithError(err).Fatal("unable to create predicate")
-		}
-
-		wsPredicate, err := predicate.LabelSelectorPredicate(metav1.LabelSelector{
-			MatchLabels: map[string]string{
-				"app":       "gitpod",
-				"component": "ws-daemon",
-			},
+		componentPredicate, err := predicate.LabelSelectorPredicate(metav1.LabelSelector{
+			MatchExpressions: []metav1.LabelSelectorRequirement{{
+				Key:      "component",
+				Operator: metav1.LabelSelectorOpIn,
+				Values:   []string{"ws-daemon", "registry-facade"},
+			}},
 		})
 		if err != nil {
 			log.WithError(err).Fatal("unable to create predicate")
 		}
 
 		err = ctrl.NewControllerManagedBy(mgr).
 			Named("pod-watcher").
-			For(&corev1.Pod{}, builder.WithPredicates(predicate.Or(rfPredicate, wsPredicate))).
+			For(&corev1.Pod{}, builder.WithPredicates(predicate.Or(componentPredicate))).
 			WithOptions(controller.Options{MaxConcurrentReconciles: 1}).
 			Complete(r)
 		if err != nil {