Skip to content

[18.0-fr4] [OSPRH-21858] Pass along the globally defined storageClassName to tel… #1715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Dec 4, 2025
Merged

[18.0-fr4] [OSPRH-21858] Pass along the globally defined storageClassName to tel… #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
pvcStorageRequest: 10G
autoscaling:
enabled: false
aodh:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
pvcStorageRequest: 10G
autoscaling:
enabled: false
aodh:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
pvcStorageRequest: 10G
autoscaling:
enabled: false
aodh:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
pvcStorageRequest: 10G
autoscaling:
enabled: false
aodh:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
pvcStorageRequest: 10G
autoscaling:
enabled: false
aodh:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
pvcStorageRequest: 10G
autoscaling:
enabled: false
aodh:
Expand Down
2 changes: 1 addition & 1 deletion ...enstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
pvcStorageRequest: 10G
autoscaling:
enabled: false
aodh:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
pvcStorageRequest: 10G
autoscaling:
enabled: false
aodh:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
pvcStorageRequest: 10G
autoscaling:
enabled: false
aodh:
Expand Down
2 changes: 1 addition & 1 deletion config/samples/core_v1beta1_openstackcontrolplane_network_isolation_tls_public_endpoint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ spec:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
pvcStorageRequest: 10G
autoscaling:
enabled: false
aodh:
Expand Down
5 changes: 5 additions & 0 deletions pkg/openstack/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down