[OSPRH-21858] Pass along the globally defined storageClassName to telemetry

jlarriba · jlarriba · commit 4b6f8bbfdfdc · 2025-11-27T12:09:53.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 		}
