Fix tests

Author: filiptronicek

components/node-labeler/cmd/run.go

@@ -314,7 +314,7 @@ func (wc *WorkspaceCountController) periodicReconciliation() {
 	for {
 		select {
 		case <-ticker.C:
-			log.Info("Starting periodic full reconciliation")
+			log.Info("starting periodic full reconciliation")
 			ctx := context.Background()
 			if _, err := wc.reconcileAllNodes(ctx); err != nil {
 				log.WithError(err).Error("periodic reconciliation failed")
@@ -366,12 +366,11 @@ func (wc *WorkspaceCountController) workspaceFilter() predicate.Predicate {
 func (wc *WorkspaceCountController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log.WithField("request", req.NamespacedName.String()).Info("WorkspaceCountController reconciling")
 
-	// Process any queued nodes first
+	// Process any queued nodes first, logging errors (not returning)
 	select {
 	case nodeName := <-wc.nodesToReconcile:
 		if err := wc.reconcileNode(ctx, nodeName); err != nil {
 			log.WithError(err).WithField("node", nodeName).Error("failed to reconcile node from queue")
-			return ctrl.Result{}, err
 		}
 	default:
 		// No nodes in queue, continue with regular reconciliation

components/node-labeler/cmd/run_test.go

@@ -136,8 +136,20 @@ var _ = BeforeSuite(func() {
 	}
 	Expect(k8sClient.Create(ctx, node)).To(Succeed())
 
+	err = k8sManager.GetFieldIndexer().IndexField(context.Background(),
+		&workspacev1.Workspace{},
+		"status.runtime.nodeName",
+		func(o client.Object) []string {
+			ws := o.(*workspacev1.Workspace)
+			if ws.Status.Runtime == nil {
+				return nil
+			}
+			return []string{ws.Status.Runtime.NodeName}
+		})
+	Expect(err).ToNot(HaveOccurred())
+
 	By("Setting up workspace controller")
-	workspaceCtrl, err = NewWorkspaceCountController(k8sClient)
+	workspaceCtrl, err = NewWorkspaceCountController(k8sManager.GetClient())
 	Expect(err).NotTo(HaveOccurred())
 	Expect(workspaceCtrl.SetupWithManager(k8sManager)).To(Succeed())