chore: Pass renku annotations to amalthea session spec (#1206)

* Generate code for new amalthea version
* Pass annotations and labels to amalthea spec template

Author: eikek

Makefile

@@ -1,5 +1,4 @@
-AMALTHEA_JS_VERSION ?= 0.22.0
-AMALTHEA_SESSIONS_VERSION ?= 0.22.0
+AMALTHEA_SESSIONS_VERSION ?= 0.25.0
 COMMON_CODEGEN_PARAMS := \
 	--output-model-type pydantic_v2.BaseModel \
 	--use-double-quotes \
@@ -106,14 +105,12 @@ k3d_cluster:  ## Creates a k3d cluster for testing
 install_amaltheas:  ## Installs both version of amalthea in the. NOTE: It uses the currently active k8s context.
 	helm repo add renku https://swissdatasciencecenter.github.io/helm-charts
 	helm repo update
-	helm upgrade --install amalthea-js renku/amalthea --version $(AMALTHEA_JS_VERSION)
 	helm upgrade --install amalthea-se renku/amalthea-sessions --version ${AMALTHEA_SESSIONS_VERSION}
 
 # TODO: Add the version variables from the top of the file here when the charts are fully published
 .PHONY: amalthea_schema
 amalthea_schema:  ## Updates generates pydantic classes from CRDs
 	curl https://raw.githubusercontent.com/SwissDataScienceCenter/amalthea/${AMALTHEA_SESSIONS_VERSION}/config/crd/bases/amalthea.dev_amaltheasessions.yaml | yq '.spec.versions[0].schema.openAPIV3Schema' | poetry run datamodel-codegen --output components/renku_data_services/notebooks/cr_amalthea_session.py --base-class renku_data_services.notebooks.cr_base.BaseCRD ${CR_CODEGEN_PARAMS}
-	curl https://raw.githubusercontent.com/SwissDataScienceCenter/amalthea/${AMALTHEA_JS_VERSION}/controller/crds/jupyter_server.yaml | yq '.spec.versions[0].schema.openAPIV3Schema' | poetry run datamodel-codegen --output components/renku_data_services/notebooks/cr_jupyter_server.py --base-class renku_data_services.notebooks.cr_base.BaseCRD ${CR_CODEGEN_PARAMS}
 
 .PHONY: shipwright_schema
 shipwright_schema:  ## Updates the Shipwright pydantic classes

components/renku_data_services/notebooks/core_sessions.py

@@ -47,6 +47,7 @@
 from renku_data_services.notebooks.api.schemas.cloud_storage import RCloneStorage
 from renku_data_services.notebooks.config import GitProviderHelperProto, NotebooksConfig
 from renku_data_services.notebooks.crs import (
+    AmaltheaMetadata,
     AmaltheaSessionSpec,
     AmaltheaSessionV1Alpha1,
     AmaltheaSessionV1Alpha1MetadataPatch,
@@ -82,6 +83,7 @@
     SizeStr,
     State,
     Storage,
+    Template,
     TlsSecret,
 )
 from renku_data_services.notebooks.image_check import ImageCheckRepository
@@ -865,7 +867,8 @@ async def start_session(
     annotations: dict[str, str] = {
         "renku.io/project_id": str(launcher.project_id),
         "renku.io/launcher_id": str(launcher_id),
-        "renku.io/resource_class_id": str(resource_class_id),
+        "renku.io/resource_class_id": str(resource_class.id),
+        "renku.io/resource_pool_id": str(resource_pool.id),
     }
 
     # Authentication
@@ -943,6 +946,8 @@ async def start_session(
     launcher_env_variables = get_launcher_env_variables(launcher, launch_request)
     env.extend(launcher_env_variables)
 
+    labels = {"renku.io/safe-username": user.id}
+
     session = AmaltheaSessionV1Alpha1(
         metadata=Metadata(name=server_name, annotations=annotations),
         spec=AmaltheaSessionSpec(
@@ -991,6 +996,7 @@ async def start_session(
             tolerations=tolerations_from_resource_class(resource_class, nb_config.sessions.tolerations_model),
             affinity=node_affinity_from_resource_class(resource_class, nb_config.sessions.affinity_model),
             serviceAccountName=service_account_name,
+            template=Template(metadata=AmaltheaMetadata(annotations=annotations, labels=labels)),
         ),
     )
     secrets_to_create = session_extras.secrets or []

components/renku_data_services/notebooks/cr_amalthea_session.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  <stdin>
-#   timestamp: 2026-01-19T14:15:52+00:00
+#   timestamp: 2026-02-10T13:31:41+00:00
 
 from __future__ import annotations
 
@@ -3712,6 +3712,21 @@ class Session(BaseCRD):
     )
 
 
+class Metadata(BaseCRD):
+    model_config = ConfigDict(
+        extra="allow",
+    )
+    annotations: Optional[Mapping[str, str]] = None
+    labels: Optional[Mapping[str, str]] = None
+
+
+class Template(BaseCRD):
+    model_config = ConfigDict(
+        extra="allow",
+    )
+    metadata: Optional[Metadata] = None
+
+
 class Toleration(BaseCRD):
     model_config = ConfigDict(
         extra="allow",
@@ -3808,6 +3823,10 @@ class Spec(BaseCRD):
         ...,
         description="Specification for the main session container that the user will access and use",
     )
+    template: Optional[Template] = Field(
+        default=None,
+        description="Template for the fields that should be added to all children (and their children if applicable).",
+    )
     tolerations: Optional[Sequence[Toleration]] = Field(
         default=None,
         description="If specified, the pod's tolerations.\nPassed right through to the Statefulset used for the session.",

components/renku_data_services/notebooks/crs.py

@@ -46,6 +46,7 @@
     State,
     Status,
     Storage,
+    Template,
     TlsSecret,
     Toleration,
 )
@@ -57,6 +58,7 @@
 from renku_data_services.notebooks.cr_amalthea_session import Limits6 as _Limits
 from renku_data_services.notebooks.cr_amalthea_session import Limits7 as LimitsStr
 from renku_data_services.notebooks.cr_amalthea_session import Location as SessionLocation
+from renku_data_services.notebooks.cr_amalthea_session import Metadata as AmaltheaMetadata
 from renku_data_services.notebooks.cr_amalthea_session import Model as _ASModel
 from renku_data_services.notebooks.cr_amalthea_session import (
     PreferredDuringSchedulingIgnoredDuringExecutionItem1 as PreferredPodAffinityItem,