Merge branch 'main' into add-prom-for-failover-res

umswmayj · web-flow · commit bde75d752dba · 2026-03-30T15:21:42.000+02:00
diff --git a/api/external/cinder/messages.go b/api/external/cinder/messages.go
@@ -50,14 +50,23 @@ func (r ExternalSchedulerRequest) GetTraceLogArgs() []slog.Attr {
 		slog.String("project", r.Context.ProjectID),
 	}
 }
-func (r ExternalSchedulerRequest) FilterHosts(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {
+func (r ExternalSchedulerRequest) Filter(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {
 	filteredHosts := make([]ExternalSchedulerHost, 0, len(includedHosts))
 	for _, host := range r.Hosts {
 		if _, exists := includedHosts[host.VolumeHost]; exists {
 			filteredHosts = append(filteredHosts, host)
 		}
 	}
 	r.Hosts = filteredHosts
+	// Also filter the weights map to only include the hosts that are still
+	// in the request, and update the weights accordingly.
+	filteredWeights := make(map[string]float64, len(includedHosts))
+	for host, weight := range includedHosts {
+		if _, exists := includedHosts[host]; exists {
+			filteredWeights[host] = weight
+		}
+	}
+	r.Weights = filteredWeights
 	return r
 }
 
diff --git a/api/external/ironcore/messages.go b/api/external/ironcore/messages.go
@@ -32,7 +32,7 @@ func (r MachinePipelineRequest) GetWeights() map[string]float64 {
 func (r MachinePipelineRequest) GetTraceLogArgs() []slog.Attr {
 	return []slog.Attr{}
 }
-func (r MachinePipelineRequest) FilterHosts(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {
+func (r MachinePipelineRequest) Filter(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {
 	filteredPools := make([]ironcorev1alpha1.MachinePool, 0, len(includedHosts))
 	for _, pool := range r.Pools {
 		if _, exists := includedHosts[pool.Name]; exists {
diff --git a/api/external/manila/messages.go b/api/external/manila/messages.go
@@ -50,14 +50,23 @@ func (r ExternalSchedulerRequest) GetTraceLogArgs() []slog.Attr {
 		slog.String("project", r.Context.ProjectID),
 	}
 }
-func (r ExternalSchedulerRequest) FilterHosts(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {
+func (r ExternalSchedulerRequest) Filter(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {
 	filteredHosts := make([]ExternalSchedulerHost, 0, len(includedHosts))
 	for _, host := range r.Hosts {
 		if _, exists := includedHosts[host.ShareHost]; exists {
 			filteredHosts = append(filteredHosts, host)
 		}
 	}
 	r.Hosts = filteredHosts
+	// Also filter the weights map to only include the hosts that are still
+	// in the request, and update the weights accordingly.
+	filteredWeights := make(map[string]float64, len(includedHosts))
+	for host, weight := range includedHosts {
+		if _, exists := includedHosts[host]; exists {
+			filteredWeights[host] = weight
+		}
+	}
+	r.Weights = filteredWeights
 	return r
 }
 
diff --git a/api/external/nova/messages.go b/api/external/nova/messages.go
@@ -61,14 +61,23 @@ func (r ExternalSchedulerRequest) GetTraceLogArgs() []slog.Attr {
 		slog.String("project", r.Context.ProjectID),
 	}
 }
-func (r ExternalSchedulerRequest) FilterHosts(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {
+func (r ExternalSchedulerRequest) Filter(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {
 	filteredHosts := make([]ExternalSchedulerHost, 0, len(includedHosts))
 	for _, host := range r.Hosts {
 		if _, exists := includedHosts[host.ComputeHost]; exists {
 			filteredHosts = append(filteredHosts, host)
 		}
 	}
 	r.Hosts = filteredHosts
+	// Also filter the weights map to only include the hosts that are still
+	// in the request, and update the weights accordingly.
+	filteredWeights := make(map[string]float64, len(includedHosts))
+	for host, weight := range includedHosts {
+		if _, exists := includedHosts[host]; exists {
+			filteredWeights[host] = weight
+		}
+	}
+	r.Weights = filteredWeights
 	return r
 }
 
diff --git a/api/external/pods/messages.go b/api/external/pods/messages.go
@@ -34,7 +34,7 @@ func (r PodPipelineRequest) GetWeights() map[string]float64 {
 func (r PodPipelineRequest) GetTraceLogArgs() []slog.Attr {
 	return []slog.Attr{}
 }
-func (r PodPipelineRequest) FilterHosts(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {
+func (r PodPipelineRequest) Filter(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {
 	filteredNodes := make([]corev1.Node, 0, len(includedHosts))
 	for _, node := range r.Nodes {
 		if _, exists := includedHosts[node.Name]; exists {
diff --git a/api/v1alpha1/datasource_types.go b/api/v1alpha1/datasource_types.go
@@ -167,7 +167,7 @@ type OpenStackDatasource struct {
 	Cinder CinderDatasource `json:"cinder"`
 
 	// How often to sync the datasource.
-	// +kubebuilder:default="60s"
+	// +kubebuilder:default="600s"
 	SyncInterval metav1.Duration `json:"syncInterval"`
 
 	// Keystone credentials secret ref for authenticating with openstack.
diff --git a/helm/bundles/cortex-cinder/Chart.yaml b/helm/bundles/cortex-cinder/Chart.yaml
@@ -5,7 +5,7 @@ apiVersion: v2
 name: cortex-cinder
 description: A Helm chart deploying Cortex for Cinder.
 type: application
-version: 0.0.48
+version: 0.0.51
 appVersion: 0.1.0
 dependencies:
   # from: file://../../library/cortex-postgres
@@ -16,12 +16,12 @@ dependencies:
   # from: file://../../library/cortex
   - name: cortex
     repository: oci://ghcr.io/cobaltcore-dev/cortex/charts
-    version: 0.0.35
+    version: 0.0.38
     alias: cortex-knowledge-controllers
   # from: file://../../library/cortex
   - name: cortex
     repository: oci://ghcr.io/cobaltcore-dev/cortex/charts
-    version: 0.0.35
+    version: 0.0.38
     alias: cortex-scheduling-controllers
 
   # Owner info adds a configmap to the kubernetes cluster with information on
diff --git a/helm/bundles/cortex-crds/Chart.yaml b/helm/bundles/cortex-crds/Chart.yaml
@@ -5,13 +5,13 @@ apiVersion: v2
 name: cortex-crds
 description: A Helm chart deploying Cortex CRDs.
 type: application
-version: 0.0.48
+version: 0.0.51
 appVersion: 0.1.0
 dependencies:
   # from: file://../../library/cortex
   - name: cortex
     repository: oci://ghcr.io/cobaltcore-dev/cortex/charts
-    version: 0.0.35
+    version: 0.0.38
 
   # Owner info adds a configmap to the kubernetes cluster with information on
   # the service owner. This makes it easier to find out who to contact in case
diff --git a/helm/bundles/cortex-ironcore/Chart.yaml b/helm/bundles/cortex-ironcore/Chart.yaml
@@ -5,13 +5,13 @@ apiVersion: v2
 name: cortex-ironcore
 description: A Helm chart deploying Cortex for IronCore.
 type: application
-version: 0.0.48
+version: 0.0.51
 appVersion: 0.1.0
 dependencies:
   # from: file://../../library/cortex
   - name: cortex
     repository: oci://ghcr.io/cobaltcore-dev/cortex/charts
-    version: 0.0.35
+    version: 0.0.38
 
   # Owner info adds a configmap to the kubernetes cluster with information on
   # the service owner. This makes it easier to find out who to contact in case
diff --git a/helm/bundles/cortex-manila/Chart.yaml b/helm/bundles/cortex-manila/Chart.yaml
@@ -5,7 +5,7 @@ apiVersion: v2
 name: cortex-manila
 description: A Helm chart deploying Cortex for Manila.
 type: application
-version: 0.0.48
+version: 0.0.51
 appVersion: 0.1.0
 dependencies:
   # from: file://../../library/cortex-postgres
@@ -16,12 +16,12 @@ dependencies:
   # from: file://../../library/cortex
   - name: cortex
     repository: oci://ghcr.io/cobaltcore-dev/cortex/charts
-    version: 0.0.35
+    version: 0.0.38
     alias: cortex-knowledge-controllers
   # from: file://../../library/cortex
   - name: cortex
     repository: oci://ghcr.io/cobaltcore-dev/cortex/charts
-    version: 0.0.35
+    version: 0.0.38
     alias: cortex-scheduling-controllers
 
   # Owner info adds a configmap to the kubernetes cluster with information on
diff --git a/helm/bundles/cortex-nova/Chart.yaml b/helm/bundles/cortex-nova/Chart.yaml
@@ -5,7 +5,7 @@ apiVersion: v2
 name: cortex-nova
 description: A Helm chart deploying Cortex for Nova.
 type: application
-version: 0.0.48
+version: 0.0.51
 appVersion: 0.1.0
 dependencies:
   # from: file://../../library/cortex-postgres
@@ -16,12 +16,12 @@ dependencies:
   # from: file://../../library/cortex
   - name: cortex
     repository: oci://ghcr.io/cobaltcore-dev/cortex/charts
-    version: 0.0.35
+    version: 0.0.38
     alias: cortex-knowledge-controllers
   # from: file://../../library/cortex
   - name: cortex
     repository: oci://ghcr.io/cobaltcore-dev/cortex/charts
-    version: 0.0.35
+    version: 0.0.38
     alias: cortex-scheduling-controllers
 
   # Owner info adds a configmap to the kubernetes cluster with information on
diff --git a/helm/bundles/cortex-nova/alerts/nova.alerts.yaml b/helm/bundles/cortex-nova/alerts/nova.alerts.yaml
@@ -485,26 +485,6 @@ groups:
         CRD retrieval. Limes scrapes may time out, affecting capacity reporting.
 
   # Committed Resource Syncer Alerts
-  - alert: CortexNovaCommittedResourceSyncerNotRunning
-    expr: |
-      increase(cortex_committed_resource_syncer_runs_total{service="cortex-nova-metrics"}[2h]) == 0
-      or
-      absent(cortex_committed_resource_syncer_runs_total{service="cortex-nova-metrics"})
-    for: 5m
-    labels:
-      context: committed-resource-syncer
-      dashboard: cortex/cortex
-      service: cortex
-      severity: warning
-      support_group: workload-management
-    annotations:
-      summary: "Committed Resource syncer not running"
-      description: >
-        The committed resource syncer has not run in the last 2 hours or the metric is missing.
-        This indicates that the syncer may have stopped, is encountering errors, or the feature
-        is not enabled. Check the syncer logs for errors or verify the commitments-sync-task is
-        in the enabledTasks configuration.
-
   - alert: CortexNovaCommittedResourceSyncerErrorsHigh
     expr: increase(cortex_committed_resource_syncer_errors_total{service="cortex-nova-metrics"}[1h]) > 3
     for: 5m
diff --git a/helm/bundles/cortex-nova/templates/datasources.yaml b/helm/bundles/cortex-nova/templates/datasources.yaml
@@ -87,6 +87,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -110,6 +111,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -133,6 +135,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -156,6 +159,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -179,6 +183,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -202,6 +207,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -225,6 +231,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -248,6 +255,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -271,6 +279,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -294,6 +303,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -317,6 +327,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
@@ -340,6 +351,7 @@ spec:
   {{- end }}
   type: openstack
   openstack:
+    syncInterval: 600s
     secretRef:
       name: cortex-nova-openstack-keystone
       namespace: {{ .Release.Namespace }}
diff --git a/helm/bundles/cortex-nova/values.yaml b/helm/bundles/cortex-nova/values.yaml
@@ -218,11 +218,7 @@ cortex-knowledge-controllers:
       - datasource-controllers
       - knowledge-controllers
       - kpis-controller
-    # How often the commitments syncer reconciles Limes commitments to Reservation CRDs
-    # 1h = 3600000000000 nanoseconds
-    committedResourceSyncInterval: 3600000000000
-    enabledTasks:
-      - commitments-sync-task
+    enabledTasks: []
 
 # Custom configuration for the cortex postgres chart.
 cortex-postgres:
diff --git a/helm/bundles/cortex-pods/Chart.yaml b/helm/bundles/cortex-pods/Chart.yaml
@@ -5,13 +5,13 @@ apiVersion: v2
 name: cortex-pods
 description: A Helm chart deploying Cortex for Pods.
 type: application
-version: 0.0.48
+version: 0.0.51
 appVersion: 0.1.0
 dependencies:
   # from: file://../../library/cortex
   - name: cortex
     repository: oci://ghcr.io/cobaltcore-dev/cortex/charts
-    version: 0.0.35
+    version: 0.0.38
 
   # Owner info adds a configmap to the kubernetes cluster with information on
   # the service owner. This makes it easier to find out who to contact in case
diff --git a/helm/library/cortex/Chart.yaml b/helm/library/cortex/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: cortex
 description: A Helm chart to distribute cortex.
 type: application
-version: 0.0.35
-appVersion: "sha-5ff49241"
+version: 0.0.38
+appVersion: "sha-b3cf6dc8"
 icon: "https://example.com/icon.png"
 dependencies: []
diff --git a/helm/library/cortex/files/crds/cortex.cloud_datasources.yaml b/helm/library/cortex/files/crds/cortex.cloud_datasources.yaml
@@ -180,7 +180,7 @@ spec:
                     type: object
                     x-kubernetes-map-type: atomic
                   syncInterval:
-                    default: 60s
+                    default: 600s
                     description: How often to sync the datasource.
                     type: string
                   type:
diff --git a/internal/knowledge/kpis/plugins/compute/resource_capacity_kvm.go b/internal/knowledge/kpis/plugins/compute/resource_capacity_kvm.go
diff --git a/internal/knowledge/kpis/plugins/compute/resource_capacity_kvm_test.go b/internal/knowledge/kpis/plugins/compute/resource_capacity_kvm_test.go
diff --git a/internal/scheduling/lib/filter_weigher_pipeline.go b/internal/scheduling/lib/filter_weigher_pipeline.go
diff --git a/internal/scheduling/lib/filter_weigher_pipeline_request.go b/internal/scheduling/lib/filter_weigher_pipeline_request.go
diff --git a/internal/scheduling/lib/filter_weigher_pipeline_request_test.go b/internal/scheduling/lib/filter_weigher_pipeline_request_test.go
diff --git a/internal/scheduling/reservations/commitments/api_change_commitments_test.go b/internal/scheduling/reservations/commitments/api_change_commitments_test.go
diff --git a/internal/scheduling/reservations/commitments/reservation_manager.go b/internal/scheduling/reservations/commitments/reservation_manager.go
diff --git a/internal/scheduling/reservations/failover/helpers.go b/internal/scheduling/reservations/failover/helpers.go

Original file line number	Diff line number	Diff line change
`@@ -50,14 +50,23 @@ func (r ExternalSchedulerRequest) GetTraceLogArgs() []slog.Attr {`
`50`	`50`	`slog.String("project", r.Context.ProjectID),`
`51`	`51`	`}`
`52`	`52`	`}`
`53`		`-func (r ExternalSchedulerRequest) FilterHosts(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {`
	`53`	`+func (r ExternalSchedulerRequest) Filter(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {`
`54`	`54`	`filteredHosts := make([]ExternalSchedulerHost, 0, len(includedHosts))`
`55`	`55`	`for _, host := range r.Hosts {`
`56`	`56`	`if _, exists := includedHosts[host.VolumeHost]; exists {`
`57`	`57`	`filteredHosts = append(filteredHosts, host)`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`r.Hosts = filteredHosts`
	`61`	`+ // Also filter the weights map to only include the hosts that are still`
	`62`	`+ // in the request, and update the weights accordingly.`
	`63`	`+ filteredWeights := make(map[string]float64, len(includedHosts))`
	`64`	`+ for host, weight := range includedHosts {`
	`65`	`+ if _, exists := includedHosts[host]; exists {`
	`66`	`+ filteredWeights[host] = weight`
	`67`	`+ }`
	`68`	`+ }`
	`69`	`+ r.Weights = filteredWeights`
`61`	`70`	`return r`
`62`	`71`	`}`
`63`	`72`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func (r MachinePipelineRequest) GetWeights() map[string]float64 {`
`32`	`32`	`func (r MachinePipelineRequest) GetTraceLogArgs() []slog.Attr {`
`33`	`33`	`return []slog.Attr{}`
`34`	`34`	`}`
`35`		`-func (r MachinePipelineRequest) FilterHosts(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {`
	`35`	`+func (r MachinePipelineRequest) Filter(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {`
`36`	`36`	`filteredPools := make([]ironcorev1alpha1.MachinePool, 0, len(includedHosts))`
`37`	`37`	`for _, pool := range r.Pools {`
`38`	`38`	`if _, exists := includedHosts[pool.Name]; exists {`
Original file line number	Diff line number	Diff line change
`@@ -61,14 +61,23 @@ func (r ExternalSchedulerRequest) GetTraceLogArgs() []slog.Attr {`
`61`	`61`	`slog.String("project", r.Context.ProjectID),`
`62`	`62`	`}`
`63`	`63`	`}`
`64`		`-func (r ExternalSchedulerRequest) FilterHosts(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {`
	`64`	`+func (r ExternalSchedulerRequest) Filter(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {`
`65`	`65`	`filteredHosts := make([]ExternalSchedulerHost, 0, len(includedHosts))`
`66`	`66`	`for _, host := range r.Hosts {`
`67`	`67`	`if _, exists := includedHosts[host.ComputeHost]; exists {`
`68`	`68`	`filteredHosts = append(filteredHosts, host)`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`r.Hosts = filteredHosts`
	`72`	`+ // Also filter the weights map to only include the hosts that are still`
	`73`	`+ // in the request, and update the weights accordingly.`
	`74`	`+ filteredWeights := make(map[string]float64, len(includedHosts))`
	`75`	`+ for host, weight := range includedHosts {`
	`76`	`+ if _, exists := includedHosts[host]; exists {`
	`77`	`+ filteredWeights[host] = weight`
	`78`	`+ }`
	`79`	`+ }`
	`80`	`+ r.Weights = filteredWeights`
`72`	`81`	`return r`
`73`	`82`	`}`
`74`	`83`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (r PodPipelineRequest) GetWeights() map[string]float64 {`
`34`	`34`	`func (r PodPipelineRequest) GetTraceLogArgs() []slog.Attr {`
`35`	`35`	`return []slog.Attr{}`
`36`	`36`	`}`
`37`		`-func (r PodPipelineRequest) FilterHosts(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {`
	`37`	`+func (r PodPipelineRequest) Filter(includedHosts map[string]float64) lib.FilterWeigherPipelineRequest {`
`38`	`38`	`filteredNodes := make([]corev1.Node, 0, len(includedHosts))`
`39`	`39`	`for _, node := range r.Nodes {`
`40`	`40`	`if _, exists := includedHosts[node.Name]; exists {`