From 03ec76edc144647e5455e8dfd497eee490d70c4d Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Thu, 20 Jun 2024 10:10:10 +0200 Subject: [PATCH] Update glance storageClass propagation We recently merged [1][2] and the Glance API have been updated to reflect the new storage interface. This patch aligns architectures repo CRs with the new structure. [1] https://github.com/openstack-k8s-operators/glance-operator/pull/554 [2] https://github.com/openstack-k8s-operators/openstack-operator/pull/843 Jira: https://issues.redhat.com/browse/OSPRH-6719 Signed-off-by: Francesco Pantano --- lib/control-plane/kustomization.yaml | 2 +- lib/control-plane/openstackcontrolplane.yaml | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/control-plane/kustomization.yaml b/lib/control-plane/kustomization.yaml index 28ac83f6b..149e35a2c 100644 --- a/lib/control-plane/kustomization.yaml +++ b/lib/control-plane/kustomization.yaml @@ -112,7 +112,7 @@ replacements: kind: OpenStackControlPlane fieldPaths: - spec.storageClass - - spec.glance.template.storageClass + - spec.glance.template.storage.storageClass - spec.telemetry.template.metricStorage.monitoringStack.storage.persistent.pvcStorageClass - source: kind: ConfigMap diff --git a/lib/control-plane/openstackcontrolplane.yaml b/lib/control-plane/openstackcontrolplane.yaml index 254ff16ee..2f1262571 100644 --- a/lib/control-plane/openstackcontrolplane.yaml +++ b/lib/control-plane/openstackcontrolplane.yaml @@ -67,8 +67,9 @@ spec: replicas: 0 networkAttachments: - storage - storageClass: _replaced_ - storageRequest: 10G + storage: + storageClass: _replaced_ + storageRequest: 10G heat: apiOverride: route: {}