Merge branch 'main' into feat/add-group-and-projects-to-resource-pool-authz

Author: SalimKayal

components/renku_data_services/crc/api.spec.yaml

@@ -1113,8 +1113,26 @@ components:
           $ref: "#/components/schemas/NodeAffinityList"
     ResourceClass:
       type: object
-      allOf:
-        - $ref: "#/components/schemas/ResourceClassProperties"
+      additionalProperties: false
+      properties:
+        name:
+          $ref: "#/components/schemas/Name"
+        default:
+          $ref: "#/components/schemas/DefaultFlag"
+        cpu:
+          $ref: "#/components/schemas/Cpu"
+        memory:
+          $ref: "#/components/schemas/Memory"
+        gpu:
+          $ref: "#/components/schemas/Gpu"
+        max_storage:
+          $ref: "#/components/schemas/Storage"
+        default_storage:
+          $ref: "#/components/schemas/Storage"
+        tolerations:
+          $ref: "#/components/schemas/K8sLabelList"
+        node_affinities:
+          $ref: "#/components/schemas/NodeAffinityList"
       required:
         - name
         - default
@@ -1150,12 +1168,29 @@ components:
         id: 1
         max_storage: 50
     ResourceClassWithId:
-      allOf:
-        - $ref: "#/components/schemas/ResourceClassProperties"
-        - type: object
-          properties:
-            id:
-              $ref: "#/components/schemas/IntegerId"
+      type: object
+      additionalProperties: false
+      properties:
+        name:
+          $ref: "#/components/schemas/Name"
+        default:
+          $ref: "#/components/schemas/DefaultFlag"
+        cpu:
+          $ref: "#/components/schemas/Cpu"
+        memory:
+          $ref: "#/components/schemas/Memory"
+        gpu:
+          $ref: "#/components/schemas/Gpu"
+        max_storage:
+          $ref: "#/components/schemas/Storage"
+        default_storage:
+          $ref: "#/components/schemas/Storage"
+        tolerations:
+          $ref: "#/components/schemas/K8sLabelList"
+        node_affinities:
+          $ref: "#/components/schemas/NodeAffinityList"
+        id:
+          $ref: "#/components/schemas/IntegerId"
       required:
         - name
         - default

components/renku_data_services/crc/apispec.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  api.spec.yaml
-#   timestamp: 2026-05-06T19:50:28+00:00
+#   timestamp: 2026-05-08T11:37:11+00:00
 
 from __future__ import annotations
 
@@ -544,7 +544,10 @@ class ResourceClassProperties(BaseAPISpec):
     )
 
 
-class ResourceClass(ResourceClassProperties):
+class ResourceClass(BaseAPISpec):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
     name: str = Field(
         ...,
         description="A name for a specific resource",
@@ -581,6 +584,18 @@ class ResourceClass(ResourceClassProperties):
         gt=0,
         le=9223372036854775807,
     )
+    tolerations: Optional[List[K8sLabel]] = Field(
+        None,
+        description="A list of k8s labels used for tolerations",
+        examples=[["test-label-1"]],
+        min_length=0,
+    )
+    node_affinities: Optional[List[NodeAffinity]] = Field(
+        None,
+        description="A list of k8s labels used for tolerations and/or node affinity",
+        examples=[[{"key": "test-label-1", "required_during_scheduling": False}]],
+        min_length=0,
+    )
 
 
 class ResourceClassPatch(ResourceClassProperties):
@@ -596,12 +611,9 @@ class ResourceClassPatchWithId(ResourceClassProperties):
     )
 
 
-class ResourceClassWithId(ResourceClassProperties):
-    id: int = Field(
-        ...,
-        description="An integer ID used to identify different resources",
-        examples=[1],
-        ge=0,
+class ResourceClassWithId(BaseAPISpec):
+    model_config = ConfigDict(
+        extra="forbid",
     )
     name: str = Field(
         ...,
@@ -639,6 +651,24 @@ class ResourceClassWithId(ResourceClassProperties):
         gt=0,
         le=9223372036854775807,
     )
+    tolerations: Optional[List[K8sLabel]] = Field(
+        None,
+        description="A list of k8s labels used for tolerations",
+        examples=[["test-label-1"]],
+        min_length=0,
+    )
+    node_affinities: Optional[List[NodeAffinity]] = Field(
+        None,
+        description="A list of k8s labels used for tolerations and/or node affinity",
+        examples=[[{"key": "test-label-1", "required_during_scheduling": False}]],
+        min_length=0,
+    )
+    id: int = Field(
+        ...,
+        description="An integer ID used to identify different resources",
+        examples=[1],
+        ge=0,
+    )
 
 
 class ResourceClassWithIdFiltered(ResourceClassWithId):