[OCTRL-1088] added TaskDefinitions to environment-controller

Author: justonedev1

control-operator/Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.25 as builder
+FROM golang:1.25 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 ARG MANAGER=task-manager

control-operator/api/v1alpha1/environment_types.go

@@ -32,14 +32,21 @@ import (
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
+// TaskDefinition is a lightweight inline task definition used within an Environment spec.
+// Unlike TaskTemplate, it is not a cluster resource — it carries a plain name and the same spec fields.
+type TaskDefinition struct {
+	Name string           `json:"name"`
+	Spec TaskTemplateSpec `json:"spec"`
+}
+
 // EnvironmentSpec defines the desired state of Environment
 type EnvironmentSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 	// The following markers will use OpenAPI v3 schema to validate the value
 	// More info: https://book.kubebuilder.io/reference/markers/crd-validation.html
 
-	Tasks map[string][]TaskTemplate `json:"tasks"`
+	Tasks map[string][]TaskDefinition `json:"tasks"`
 	// +kubebuilder:validation:Enum=standby;deployed;configured;running
 	State string `json:"state"`
 }

control-operator/api/v1alpha1/tasktemplate_types.go

@@ -53,6 +53,10 @@ type TaskTemplateSpec struct {
 	// +optional
 	Properties map[string]string `json:"properties,omitempty"`
 
+	// Arguments defines transition arguments passed to the task via OCC gRPC.
+	// +optional
+	Arguments map[string]string `json:"arguments,omitempty"`
+
 	// Names of the expected Environment variables to be passed to Pod
 	// +optional
 	EnvVars []string `json:"envVars,omitempty"`

control-operator/api/v1alpha1/zz_generated.deepcopy.go

@@ -47,14 +47,14 @@ spec:
                 additionalProperties:
                   items:
                     properties:
-                      apiVersion:
-                        type: string
-                      kind:
+                      name:
                         type: string
-                      metadata:
-                        type: object
                       spec:
                         properties:
+                          arguments:
+                            additionalProperties:
+                              type: string
+                            type: object
                           bind:
                             items:
                               properties:
@@ -3940,6 +3940,7 @@ spec:
                             type: object
                         type: object
                     required:
+                    - name
                     - spec
                     type: object
                   type: array

control-operator/config/crd/bases/aliecs.alice.cern_environments.yaml

@@ -26,6 +26,10 @@ spec:
             type: object
           spec:
             properties:
+              arguments:
+                additionalProperties:
+                  type: string
+                type: object
               bind:
                 items:
                   properties:

control-operator/config/crd/bases/aliecs.alice.cern_tasktemplates.yaml

@@ -23,39 +23,42 @@ spec:
       labels:
         control-plane: environment-manager
     spec:
+      imagePullSecrets:
+        - name: gitlab-registry-secret
       securityContext:
         runAsNonRoot: true
       containers:
-      - command:
-        - /manager
-        args:
-        - --leader-elect
-        - --health-probe-bind-address=:8081
-        image: environment-manager:latest
-        name: manager
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-              - "ALL"
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8081
-          initialDelaySeconds: 15
-          periodSeconds: 20
-        readinessProbe:
-          httpGet:
-            path: /readyz
-            port: 8081
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        resources:
-          limits:
-            cpu: 500m
-            memory: 128Mi
-          requests:
-            cpu: 10m
-            memory: 64Mi
+        - command:
+            - /manager
+          args:
+            - --leader-elect
+            - --health-probe-bind-address=:9080
+            - --metrics-bind-address=:9081
+          image: environment-manager:latest
+          name: manager
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop:
+                - "ALL"
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 9080
+            initialDelaySeconds: 15
+            periodSeconds: 20
+          readinessProbe:
+            httpGet:
+              path: /readyz
+              port: 9080
+            initialDelaySeconds: 5
+            periodSeconds: 10
+          resources:
+            limits:
+              cpu: 500m
+              memory: 128Mi
+            requests:
+              cpu: 10m
+              memory: 64Mi
       serviceAccountName: controller-manager
       terminationGracePeriodSeconds: 10