From 4b6f8bbfdfdccbbf3e703d713cbba0e07f00ae34 Mon Sep 17 00:00:00 2001 From: jlarriba Date: Tue, 25 Nov 2025 17:12:22 +0100 Subject: [PATCH] [OSPRH-21858] Pass along the globally defined storageClassName to telemetry --- .../core_v1beta1_openstackcontrolplane.yaml | 2 +- .../core_v1beta1_openstackcontrolplane_collapsed_cell.yaml | 2 +- .../samples/core_v1beta1_openstackcontrolplane_galera.yaml | 2 +- .../core_v1beta1_openstackcontrolplane_galera_3replicas.yaml | 2 +- ...beta1_openstackcontrolplane_galera_network_isolation.yaml | 2 +- ...stackcontrolplane_galera_network_isolation_3replicas.yaml | 2 +- ...rk_isolation_3replicas_only_default_enabled_services.yaml | 2 +- ...core_v1beta1_openstackcontrolplane_network_isolation.yaml | 2 +- ...v1beta1_openstackcontrolplane_network_isolation_ceph.yaml | 2 +- ...ckcontrolplane_network_isolation_tls_public_endpoint.yaml | 2 +- internal/openstack/telemetry.go | 5 +++++ 11 files changed, 15 insertions(+), 10 deletions(-) diff --git a/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml b/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml index d6b1f5493..acf7508f4 100644 --- a/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml +++ b/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml @@ -158,7 +158,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 20G + pvcStorageRequest: 10G autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml index f7f6810b2..b2fb8eb37 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml @@ -143,7 +143,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 20G + pvcStorageRequest: 10G autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml index 4995acead..fa42679b1 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml @@ -171,7 +171,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 20G + pvcStorageRequest: 10G autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml index e25d36fb2..b7c744b16 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml @@ -161,7 +161,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 20G + pvcStorageRequest: 10G autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml index 902936f0a..47ee742b4 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml @@ -338,7 +338,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 20G + pvcStorageRequest: 10G autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml index 3389549d5..de4c833df 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml @@ -340,7 +340,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 20G + pvcStorageRequest: 10G autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml index 92029323b..06eedb768 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml @@ -260,7 +260,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 20G + pvcStorageRequest: 10G autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index 703269fc5..971778a0f 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -334,7 +334,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 20G + pvcStorageRequest: 10G autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml index 012ad7bc7..86525cd39 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml @@ -384,7 +384,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 20G + pvcStorageRequest: 10G autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml index 838bf887b..021abff32 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml @@ -337,7 +337,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 20G + pvcStorageRequest: 10G autoscaling: enabled: false aodh: diff --git a/internal/openstack/telemetry.go b/internal/openstack/telemetry.go index 61bb8f8c0..5c9e3d377 100644 --- a/internal/openstack/telemetry.go +++ b/internal/openstack/telemetry.go @@ -432,6 +432,11 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont if telemetry.Spec.Autoscaling.HeatInstance == "" { telemetry.Spec.Autoscaling.HeatInstance = heatName } + if telemetry.Spec.MetricStorage.MonitoringStack != nil && + telemetry.Spec.MetricStorage.MonitoringStack.Persistent != nil && + telemetry.Spec.MetricStorage.MonitoringStack.Persistent.PvcStorageClass == "" { + telemetry.Spec.MetricStorage.MonitoringStack.Persistent.PvcStorageClass = instance.Spec.StorageClass + } if telemetry.Spec.CloudKitty.StorageClass == "" { telemetry.Spec.CloudKitty.StorageClass = instance.Spec.StorageClass }