1

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

Author: aledbf

components/node-labeler/cmd/run.go

@@ -78,9 +78,20 @@ var runCmd = &cobra.Command{
 			client,
 		}
 
-		filterPredicate, err := predicate.LabelSelectorPredicate(metav1.LabelSelector{
+		rfPredicate, err := predicate.LabelSelectorPredicate(metav1.LabelSelector{
 			MatchLabels: map[string]string{
-				"required-by-node-labeler": "true",
+				"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",
 			},
 		})
 		if err != nil {
@@ -89,7 +100,7 @@ var runCmd = &cobra.Command{
 
 		err = ctrl.NewControllerManagedBy(mgr).
 			Named("pod-watcher").
-			For(&corev1.Pod{}, builder.WithPredicates(filterPredicate)).
+			For(&corev1.Pod{}, builder.WithPredicates(predicate.Or(rfPredicate, wsPredicate))).
 			WithOptions(controller.Options{MaxConcurrentReconciles: 1}).
 			Complete(r)
 		if err != nil {
@@ -133,6 +144,8 @@ type PodReconciler struct {
 }
 
 func (r *PodReconciler) Reconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
+	log.WithField("pod", req.Name).Info("reconciling")
+
 	var pod corev1.Pod
 	err := r.Get(ctx, req.NamespacedName, &pod)
 	if err != nil {