Add basic committed resource functionality with reservations

CODEOWNERS

@@ -1 +1 @@
-* arno.uhlig@sap.com julius.clausnitzer@sap.com malte.viering@sap.com marcel.bloecher@sap.com markus.wieland@sap.com p.matthes@sap.com
+* arno.uhlig@sap.com julius.clausnitzer@sap.com malte.viering@sap.com marcel.gute@sap.com markus.wieland@sap.com p.matthes@sap.com

api/v1alpha1/knowledge_types.go

@@ -93,6 +93,11 @@ type KnowledgeStatus struct {
 	// +kubebuilder:validation:Optional
 	LastExtracted metav1.Time `json:"lastExtracted"`
 
+	// When the extracted knowledge content last changed.
+	// Updated only when the Raw data actually changes, not on every reconcile.
+	// +kubebuilder:validation:Optional
+	LastContentChange metav1.Time `json:"lastContentChange,omitempty"`
+
 	// The raw data behind the extracted knowledge, e.g. a list of features.
 	// +kubebuilder:validation:Optional
 	Raw runtime.RawExtension `json:"raw"`
@@ -111,6 +116,7 @@ type KnowledgeStatus struct {
 // +kubebuilder:printcolumn:name="Domain",type="string",JSONPath=".spec.schedulingDomain"
 // +kubebuilder:printcolumn:name="Created",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:printcolumn:name="Extracted",type="date",JSONPath=".status.lastExtracted"
+// +kubebuilder:printcolumn:name="Changed",type="date",JSONPath=".status.lastContentChange"
 // +kubebuilder:printcolumn:name="Recency",type="string",JSONPath=".spec.recency"
 // +kubebuilder:printcolumn:name="Features",type="integer",JSONPath=".status.rawLength"
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"

api/v1alpha1/reservation_types.go

@@ -21,6 +21,20 @@ const (
 	ReservationTypeFailover ReservationType = "FailoverReservation"
 )
 
+// Label keys for Reservation metadata.
+// Labels follow Kubernetes naming conventions using reverse-DNS notation
+const (
+	// ===== Common Reservation Labels =====
+
+	// LabelReservationType identifies the type of reservation.
+	// This label is present on all reservations to enable type-based filtering.
+	LabelReservationType = "reservations.cortex.sap.com/type"
+
+	// Reservation type label values
+	ReservationTypeLabelCommittedResource = "committed-resource"
+	ReservationTypeLabelFailover          = "failover"
+)
+
 // CommittedResourceAllocation represents a workload's assignment to a committed resource reservation slot.
 // The workload could be a VM (Nova/IronCore), Pod (Kubernetes), or other resource.
 type CommittedResourceAllocation struct {
@@ -79,6 +93,10 @@ type ReservationSpec struct {
 	// +kubebuilder:validation:Optional
 	SchedulingDomain string `json:"schedulingDomain,omitempty"`
 
+	// AvailabilityZone specifies the availability zone for this reservation, if restricted to a specific AZ.
+	// +kubebuilder:validation:Optional
+	AvailabilityZone string `json:"availabilityZone,omitempty"`
+
 	// Resources to reserve for this instance.
 	// +kubebuilder:validation:Optional
 	Resources map[string]resource.Quantity `json:"resources,omitempty"`
@@ -166,7 +184,7 @@ type ReservationStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
-// +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".spec.type"
+// +kubebuilder:printcolumn:name="Type",type="string",JSONPath=".metadata.labels['reservations\\.cortex\\.sap\\.com/type']"
 // +kubebuilder:printcolumn:name="Host",type="string",JSONPath=".status.host"
 // +kubebuilder:printcolumn:name="Ready",type="string",JSONPath=".status.conditions[?(@.type=='Ready')].status"
 

cmd/main.go

@@ -309,6 +309,10 @@ func main() {
 		httpAPIConf := conf.GetConfigOrDie[nova.HTTPAPIConfig]()
 		nova.NewAPI(httpAPIConf, filterWeigherController).Init(mux)
 
+		// Initialize commitments API for LIQUID interface
+		commitmentsAPI := commitments.NewAPI(multiclusterClient)
+		commitmentsAPI.Init(mux)
+
 		// Detector pipeline controller setup.
 		novaClient := nova.NewNovaClient()
 		novaClientConfig := conf.GetConfigOrDie[nova.NovaClientConfig]()
@@ -456,11 +460,11 @@ func main() {
 		monitor := reservationscontroller.NewControllerMonitor(multiclusterClient)
 		metrics.Registry.MustRegister(&monitor)
 		reservationsControllerConfig := conf.GetConfigOrDie[reservationscontroller.Config]()
+
 		if err := (&reservationscontroller.ReservationReconciler{
-			Client:           multiclusterClient,
-			Scheme:           mgr.GetScheme(),
-			Conf:             reservationsControllerConfig,
-			HypervisorClient: reservationscontroller.NewHypervisorClient(),
+			Client: multiclusterClient,
+			Scheme: mgr.GetScheme(),
+			Conf:   reservationsControllerConfig,
 		}).SetupWithManager(mgr, multiclusterClient); err != nil {
 			setupLog.Error(err, "unable to create controller", "controller", "Reservation")
 			os.Exit(1)

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/go-gorp/gorp v2.2.0+incompatible
 	github.com/gophercloud/gophercloud/v2 v2.10.0
 	github.com/ironcore-dev/ironcore v0.2.4
+	github.com/majewsky/gg v1.5.0
 	github.com/prometheus/client_golang v1.23.2
 	github.com/prometheus/client_model v0.6.2
 	github.com/sapcc/go-bits v0.0.0-20260226170120-c20f89b66c3c
@@ -36,7 +37,7 @@ require (
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/logr v1.4.3
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.22.1 // indirect
@@ -71,7 +72,7 @@ require (
 	github.com/poy/onpar v0.3.5 // indirect
 	github.com/prometheus/common v0.67.5 // indirect
 	github.com/prometheus/procfs v0.17.0 // indirect
-	github.com/sapcc/go-api-declarations v1.20.2 // indirect
+	github.com/sapcc/go-api-declarations v1.20.2
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/cobra v1.10.1 // indirect
 	github.com/spf13/pflag v1.0.10 // indirect

helm/bundles/cortex-cinder/values.yaml

@@ -8,7 +8,7 @@ owner-info:
     - "arno.uhlig@sap.com"
     - "julius.clausnitzer@sap.com"
     - "malte.viering@sap.com"
-    - "marcel.bloecher@sap.com"
+    - "marcel.gute@sap.com"
     - "markus.wieland@sap.com"
     - "p.matthes@sap.com"
   support-group: "workload-management"

helm/bundles/cortex-crds/values.yaml

@@ -8,7 +8,7 @@ owner-info:
     - "arno.uhlig@sap.com"
     - "julius.clausnitzer@sap.com"
     - "malte.viering@sap.com"
-    - "marcel.bloecher@sap.com"
+    - "marcel.gute@sap.com"
     - "markus.wieland@sap.com"
     - "p.matthes@sap.com"
   support-group: "workload-management"

helm/bundles/cortex-ironcore/values.yaml

@@ -8,7 +8,7 @@ owner-info:
     - "arno.uhlig@sap.com"
     - "julius.clausnitzer@sap.com"
     - "malte.viering@sap.com"
-    - "marcel.bloecher@sap.com"
+    - "marcel.gute@sap.com"
     - "markus.wieland@sap.com"
     - "p.matthes@sap.com"
   support-group: "workload-management"

helm/bundles/cortex-manila/values.yaml

@@ -8,7 +8,7 @@ owner-info:
     - "arno.uhlig@sap.com"
     - "julius.clausnitzer@sap.com"
     - "malte.viering@sap.com"
-    - "marcel.bloecher@sap.com"
+    - "marcel.gute@sap.com"
     - "markus.wieland@sap.com"
     - "p.matthes@sap.com"
   support-group: "workload-management"

helm/bundles/cortex-nova/templates/knowledges_kvm.yaml

@@ -2,6 +2,23 @@
 ---
 apiVersion: cortex.cloud/v1alpha1
 kind: Knowledge
+metadata:
+  name: flavor-groups
+spec:
+  schedulingDomain: nova
+  extractor:
+    name: flavor_groups
+  recency: "5m"
+  description: |
+    This knowledge extracts flavor groups from Nova flavors based on the
+    hw_version extra_spec. It identifies all flavors belonging to each group
+    and determines the largest flavor for reservation slot sizing.
+  dependencies:
+    datasources:
+      - name: nova-flavors
+---
+apiVersion: cortex.cloud/v1alpha1
+kind: Knowledge
 metadata:
   name: kvm-libvirt-domain-cpu-steal-pct
 spec:

helm/bundles/cortex-nova/values.yaml

@@ -8,7 +8,7 @@ owner-info:
     - "arno.uhlig@sap.com"
     - "julius.clausnitzer@sap.com"
     - "malte.viering@sap.com"
-    - "marcel.bloecher@sap.com"
+    - "marcel.gute@sap.com"
     - "markus.wieland@sap.com"
     - "p.matthes@sap.com"
   support-group: "workload-management"
@@ -114,8 +114,12 @@ cortex-scheduling-controllers:
       - nova-pipeline-controllers
       - nova-deschedulings-executor
       - explanation-controller
+      - reservations-controller
     enabledTasks:
       - nova-decisions-cleanup-task
+    # Endpoints configuration for reservations controller
+    endpoints:
+      novaExternalScheduler: "http://localhost:8080/scheduler/nova/external"
 
 cortex-knowledge-controllers:
   <<: *cortex
@@ -134,7 +138,6 @@ cortex-knowledge-controllers:
       - datasource-controllers
       - knowledge-controllers
       - kpis-controller
-      - reservations-controller
     enabledTasks:
       - commitments-sync-task
 

helm/bundles/cortex-pods/values.yaml

@@ -8,7 +8,7 @@ owner-info:
     - "arno.uhlig@sap.com"
     - "julius.clausnitzer@sap.com"
     - "malte.viering@sap.com"
-    - "marcel.bloecher@sap.com"
+    - "marcel.gute@sap.com"
     - "markus.wieland@sap.com"
     - "p.matthes@sap.com"
   support-group: "workload-management"

helm/library/cortex/files/crds/cortex.cloud_knowledges.yaml

@@ -24,6 +24,9 @@ spec:
     - jsonPath: .status.lastExtracted
       name: Extracted
       type: date
+    - jsonPath: .status.lastContentChange
+      name: Changed
+      type: date
     - jsonPath: .spec.recency
       name: Recency
       type: string
@@ -248,6 +251,12 @@ spec:
                   - type
                   type: object
                 type: array
+              lastContentChange:
+                description: |-
+                  When the extracted knowledge content last changed.
+                  Updated only when the Raw data actually changes, not on every reconcile.
+                format: date-time
+                type: string
               lastExtracted:
                 description: When the knowledge was last successfully extracted.
                 format: date-time

helm/library/cortex/files/crds/cortex.cloud_reservations.yaml

@@ -15,7 +15,7 @@ spec:
   scope: Cluster
   versions:
   - additionalPrinterColumns:
-    - jsonPath: .spec.type
+    - jsonPath: .metadata.labels['reservations\.cortex\.sap\.com/type']
       name: Type
       type: string
     - jsonPath: .status.host
@@ -49,6 +49,10 @@ spec:
           spec:
             description: spec defines the desired state of Reservation
             properties:
+              availabilityZone:
+                description: AvailabilityZone specifies the availability zone for
+                  this reservation, if restricted to a specific AZ.
+                type: string
               committedResourceReservation:
                 description: |-
                   CommittedResourceReservation contains fields specific to committed resource reservations.

internal/knowledge/extractor/controller.go

@@ -5,6 +5,8 @@ package extractor
 
 import (
 	"context"
+	"encoding/json"
+	"reflect"
 	"time"
 
 	"github.com/cobaltcore-dev/cortex/api/v1alpha1"
@@ -202,9 +204,27 @@ func (r *KnowledgeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 		Reason:  "KnowledgeExtracted",
 		Message: "knowledge extracted successfully",
 	})
+
+	// Check if content actually changed by comparing deserialized data structures.
+	// This avoids false positives from JSON serialization non-determinism (e.g., map key ordering).
+	contentChanged := true
+	if len(knowledge.Status.Raw.Raw) > 0 {
+		var oldData, newData interface{}
+		if err := json.Unmarshal(knowledge.Status.Raw.Raw, &oldData); err == nil {
+			if err := json.Unmarshal(raw.Raw, &newData); err == nil {
+				contentChanged = !reflect.DeepEqual(oldData, newData)
+			}
+		}
+	}
+
 	knowledge.Status.Raw = raw
 	knowledge.Status.LastExtracted = metav1.NewTime(time.Now())
 	knowledge.Status.RawLength = len(features)
+
+	if contentChanged {
+		log.Info("content of knowledge has changed", "name", knowledge.Name)
+		knowledge.Status.LastContentChange = metav1.NewTime(time.Now())
+	}
 	patch := client.MergeFrom(old)
 	if err := r.Status().Patch(ctx, knowledge, patch); err != nil {
 		log.Error(err, "failed to patch knowledge status")