From 6be2bb162fe7bba6de636ca129439cde46f5b597 Mon Sep 17 00:00:00 2001 From: mblos Date: Fri, 27 Mar 2026 16:34:20 +0100 Subject: [PATCH] deactivate cr syncer for now --- .../cortex-nova/alerts/nova.alerts.yaml | 20 ------------------- helm/bundles/cortex-nova/values.yaml | 6 +----- .../api_change_commitments_test.go | 10 ++++++++++ 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/helm/bundles/cortex-nova/alerts/nova.alerts.yaml b/helm/bundles/cortex-nova/alerts/nova.alerts.yaml index 654adbe1c..2449fa390 100644 --- 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/values.yaml b/helm/bundles/cortex-nova/values.yaml index a6d777417..d32316e47 100644 --- 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/internal/scheduling/reservations/commitments/api_change_commitments_test.go b/internal/scheduling/reservations/commitments/api_change_commitments_test.go index 81113f5f5..a0efef7b0 100644 --- a/internal/scheduling/reservations/commitments/api_change_commitments_test.go +++ b/internal/scheduling/reservations/commitments/api_change_commitments_test.go @@ -84,6 +84,16 @@ func TestCommitmentChangeIntegration(t *testing.T) { ExpectedReservations: []*TestReservation{}, ExpectedAPIResponse: newAPIResponse("1 commitment(s) failed", "commitment long-long-long-long-long-long-long-long-long-long-long-long-long-: unexpected commitment format"), }, + { + Name: "Planned CR is ignored in validation, no scheduling or capacity reservation", + VMs: []*TestVM{}, + Flavors: []*TestFlavor{m1Small}, + CommitmentRequest: newCommitmentRequest("az-a", false, 1234, + createCommitment("hw_version_hana_1_ram", "project-A", "uuid-new", "planned", 200), + ), + ExpectedReservations: []*TestReservation{}, + ExpectedAPIResponse: newAPIResponse(), + }, { Name: "Invalid CR name - spaces", VMs: []*TestVM{},