[OCTRL-1088] rename author and properly handling TaskController as a daemon set

justonedev1 · justonedev1 · commit 53d5a96047ba · 2026-05-11T15:49:50.000+02:00
diff --git a/control-operator/Makefile b/control-operator/Makefile
@@ -220,8 +220,15 @@ deploy-environment: manifests kustomize ## Deploy environment controller to the
 	$(KUSTOMIZE) build config/environment | $(KUBECTL) apply -f - --server-side
 
 .PHONY: undeploy
-undeploy: ## Undeploy both controllers from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
-	$(KUSTOMIZE) build config/default | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
+undeploy: undeploy-task undeploy-environment ## Undeploy both controllers from the K8s cluster specified in ~/.kube/config.
+
+.PHONY: undeploy-task
+undeploy-task: kustomize ## Undeploy task controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
+	$(KUSTOMIZE) build config/task | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
+
+.PHONY: undeploy-environment
+undeploy-environment: kustomize ## Undeploy environment controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
+	$(KUSTOMIZE) build config/environment | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
 
 ##@ Build Dependencies
 
diff --git a/control-operator/README.md b/control-operator/README.md
@@ -78,6 +78,12 @@ make run
 
 **NOTE:** You can also run this in one step by running: `make install run`
 
+**NOTE:** The task-manager requires a `NODE_NAME` environment variable to know which node it is responsible for. In-cluster this is injected automatically via the downward API. When running locally you must set it manually:
+
+```sh
+NODE_NAME=<your-node-name> make run
+```
+
 ### Modifying the API definitions
 
 If you are editing the API definitions, generate the manifests such as CRs or CRDs using:
diff --git a/control-operator/api/v1alpha1/environment_types.go b/control-operator/api/v1alpha1/environment_types.go
@@ -1,8 +1,8 @@
 /*
  * === This file is part of ALICE O² ===
  *
- * Copyright 2024 CERN and copyright holders of ALICE O².
- * Author: Teo Mrnjavac <teo.mrnjavac@cern.ch>
+ * Copyright 2026 CERN and copyright holders of ALICE O².
+ * Author: Michal Tichak <michal.tichak@cern.ch>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -66,6 +66,8 @@ type EnvironmentStatus struct {
 	// - "Progressing": the resource is being created or updated
 	// - "Degraded": the resource failed to reach or maintain its desired state
 	//
+	// TODO: use conditions properly during deployment
+	//
 	// The status of each condition is one of True, False, or Unknown.
 	// +listType=map
 	// +listMapKey=type
diff --git a/control-operator/api/v1alpha1/tasktemplate_types.go b/control-operator/api/v1alpha1/tasktemplate_types.go
@@ -1,8 +1,8 @@
 /*
  * === This file is part of ALICE O² ===
  *
- * Copyright 2024 CERN and copyright holders of ALICE O².
- * Author: Teo Mrnjavac <teo.mrnjavac@cern.ch>
+ * Copyright 2026 CERN and copyright holders of ALICE O².
+ * Author: Michal Tichak <michal.tichak@cern.ch>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/control-operator/cmd/environment-manager/main.go b/control-operator/cmd/environment-manager/main.go
@@ -1,8 +1,8 @@
 /*
  * === This file is part of ALICE O² ===
  *
- * Copyright 2024 CERN and copyright holders of ALICE O².
- * Author: Teo Mrnjavac <teo.mrnjavac@cern.ch>
+ * Copyright 2026 CERN and copyright holders of ALICE O².
+ * Author: Michal Tichak <michal.tichak@cern.ch>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/control-operator/cmd/main.go b/control-operator/cmd/main.go
diff --git a/control-operator/cmd/task-manager/main.go b/control-operator/cmd/task-manager/main.go
@@ -1,8 +1,8 @@
 /*
  * === This file is part of ALICE O² ===
  *
- * Copyright 2024 CERN and copyright holders of ALICE O².
- * Author: Teo Mrnjavac <teo.mrnjavac@cern.ch>
+ * Copyright 2026 CERN and copyright holders of ALICE O².
+ * Author: Michal Tichak <michal.tichak@cern.ch>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,7 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"os"
 
 	"k8s.io/apimachinery/pkg/runtime"
@@ -82,10 +83,17 @@ func main() {
 		os.Exit(1)
 	}
 
+	nodeName := os.Getenv("NODE_NAME")
+	if nodeName == "" {
+		setupLog.Error(fmt.Errorf("NODE_NAME environment variable not set"), "NODE_NAME is required")
+		os.Exit(1)
+	}
+
 	if err = (&controller.TaskReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("task-controller"),
+		NodeName: nodeName,
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Task")
 		os.Exit(1)
diff --git a/control-operator/config/manager/task-manager/task-manager.yaml b/control-operator/config/manager/task-manager/task-manager.yaml
@@ -31,9 +31,13 @@ spec:
         - command:
             - /manager
           args:
-            - --leader-elect
             - --health-probe-bind-address=:9082
             - --metrics-bind-address=:9083
+          env:
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
           image: task-manager:latest
           name: manager
           securityContext:
diff --git a/control-operator/internal/controller/environment_controller.go b/control-operator/internal/controller/environment_controller.go
@@ -1,8 +1,8 @@
 /*
  * === This file is part of ALICE O² ===
  *
- * Copyright 2024 CERN and copyright holders of ALICE O².
- * Author: Teo Mrnjavac <teo.mrnjavac@cern.ch>
+ * Copyright 2026 CERN and copyright holders of ALICE O².
+ * Author: Michal Tichak <michal.tichak@cern.ch>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/control-operator/internal/controller/environment_controller_test.go b/control-operator/internal/controller/environment_controller_test.go
@@ -1,8 +1,8 @@
 /*
  * === This file is part of ALICE O² ===
  *
- * Copyright 2024 CERN and copyright holders of ALICE O².
- * Author: Teo Mrnjavac <teo.mrnjavac@cern.ch>
+ * Copyright 2026 CERN and copyright holders of ALICE O².
+ * Author: Michal Tichak <michal.tichak@cern.ch>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/control-operator/internal/controller/task_controller.go b/control-operator/internal/controller/task_controller.go
@@ -39,10 +39,12 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
 	aliecsv1alpha1 "github.com/AliceO2Group/Control/operator/api/v1alpha1"
 	"github.com/go-logr/logr"
@@ -53,6 +55,7 @@ type TaskReconciler struct {
 	client.Client
 	Scheme   *runtime.Scheme
 	Recorder record.EventRecorder
+	NodeName string
 }
 
 var clientsForContainers map[string]*OccClient = make(map[string]*OccClient)
@@ -368,7 +371,15 @@ func isPodFailed(pod *v1.Pod) (bool, string) {
 // SetupWithManager sets up the controller with the Manager.
 func (r *TaskReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
-		For(&aliecsv1alpha1.Task{}).
+		For(&aliecsv1alpha1.Task{}, builder.WithPredicates(
+			predicate.NewPredicateFuncs(func(obj client.Object) bool {
+				task, ok := obj.(*aliecsv1alpha1.Task)
+				if !ok {
+					return false
+				}
+				return task.Spec.NodeName == r.NodeName
+			}),
+		)).
 		Owns(&v1.Pod{}).
 		WithOptions(controller.Options{MaxConcurrentReconciles: 1}).
 		Complete(r)

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`/*`
`2`	`2`	`* === This file is part of ALICE O² ===`
`3`	`3`	`*`
`4`		`- * Copyright 2024 CERN and copyright holders of ALICE O².`
`5`		`- * Author: Teo Mrnjavac <teo.mrnjavac@cern.ch>`
	`4`	`+ * Copyright 2026 CERN and copyright holders of ALICE O².`
	`5`	`+ * Author: Michal Tichak <michal.tichak@cern.ch>`
`6`	`6`	`*`
`7`	`7`	`* This program is free software: you can redistribute it and/or modify`
`8`	`8`	`* it under the terms of the GNU General Public License as published by`