From 37be1922e9f405db9c339a226cb4f86e598d1687 Mon Sep 17 00:00:00 2001 From: Josef Hanzlicek Date: Mon, 16 Mar 2026 14:27:49 +0100 Subject: [PATCH] Changed size units in samples and kuttl tests from SI to binary, according to OSPRH-27441 --- .../core_v1beta1_openstackcontrolplane.yaml | 16 ++++++++-------- ...ta1_openstackcontrolplane_collapsed_cell.yaml | 12 ++++++------ ...ore_v1beta1_openstackcontrolplane_galera.yaml | 16 ++++++++-------- ...1_openstackcontrolplane_galera_3replicas.yaml | 16 ++++++++-------- ...v1beta1_openstackcontrolplane_galera_fr1.yaml | 16 ++++++++-------- ...ackcontrolplane_galera_network_isolation.yaml | 16 ++++++++-------- ...plane_galera_network_isolation_3replicas.yaml | 16 ++++++++-------- ..._3replicas_only_default_enabled_services.yaml | 12 ++++++------ ...ontrolplane_galera_network_isolation_fr1.yaml | 16 ++++++++-------- ..._openstackcontrolplane_network_isolation.yaml | 16 ++++++++-------- ...stackcontrolplane_network_isolation_ceph.yaml | 16 ++++++++-------- ...ne_network_isolation_tls_public_endpoint.yaml | 16 ++++++++-------- test/kuttl/common/assert-sample-deployment.yaml | 12 ++++++------ .../01-assert-collapsed-cell.yaml | 10 +++++----- .../01-assert-galera-3replicas.yaml | 12 ++++++------ .../00-assert-deploy-openstack.yaml | 12 ++++++------ .../03-assert-new-certs.yaml | 12 ++++++------ .../01-assert-deploy-openstack.yaml | 12 ++++++------ .../09-assert-deploy-openstack.yaml | 12 ++++++------ .../03-assert-deploy-openstack.yaml | 12 ++++++------ 20 files changed, 139 insertions(+), 139 deletions(-) diff --git a/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml b/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml index f072a1579c..b49eb4f750 100644 --- a/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml +++ b/config/samples/base/openstackcontrolplane/core_v1beta1_openstackcontrolplane.yaml @@ -15,12 +15,12 @@ spec: templates: openstack: storageClass: local-storage - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: storageClass: local-storage - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 rabbitmq: @@ -74,7 +74,7 @@ spec: swift_store_key = {{ .ServicePassword }} storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi keystoneEndpoint: default glanceAPIs: default: @@ -108,11 +108,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnController: {} ovnNorthd: replicas: 1 @@ -144,7 +144,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -162,7 +162,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: @@ -218,4 +218,4 @@ spec: designateBackendbind9: replicas: 1 # backend needs to be configured storageClass: local-storage - storageRequest: 10G + storageRequest: 10Gi diff --git a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml index 7842b4b909..bebe13c59c 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml @@ -14,7 +14,7 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi rabbitmq: templates: rabbitmq: @@ -64,7 +64,7 @@ spec: swift_store_key = {{ .ServicePassword }} storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi keystoneEndpoint: default glanceAPIs: default: @@ -88,11 +88,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: {} @@ -130,7 +130,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -148,7 +148,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml index b266ff5b7c..0e7c7a5517 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml @@ -14,11 +14,11 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 rabbitmq: @@ -72,7 +72,7 @@ spec: swift_store_key = {{ .ServicePassword }} storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi keystoneEndpoint: default glanceAPIs: default: @@ -106,11 +106,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: {} @@ -159,7 +159,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -177,7 +177,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: @@ -249,6 +249,6 @@ spec: designateBackendbind9: replicas: 1 storageClass: local-storage - storageRequest: 10G + storageRequest: 10Gi networkAttachments: - designate diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml index 57dae1fe79..ddfd158208 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml @@ -14,11 +14,11 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 3 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 3 rabbitmq: @@ -71,7 +71,7 @@ spec: databaseInstance: openstack storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi secret: osp-secret keystoneEndpoint: default glanceAPIs: @@ -106,11 +106,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: {} @@ -149,7 +149,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -167,7 +167,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: @@ -234,7 +234,7 @@ spec: designateBackendbind9: replicas: 1 storageClass: local-storage - storageRequest: 10G + storageRequest: 10Gi networkAttachments: - designate swift: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_fr1.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_fr1.yaml index fa42679b1a..302f6ea8b6 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_fr1.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_fr1.yaml @@ -12,11 +12,11 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 rabbitmq: @@ -68,7 +68,7 @@ spec: swift_store_key = {{ .ServicePassword }} storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi keystoneEndpoint: default glanceAPIs: default: @@ -102,11 +102,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: {} @@ -153,7 +153,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -171,7 +171,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: @@ -239,6 +239,6 @@ spec: designateBackendbind9: replicas: 1 storageClass: local-storage - storageRequest: 10G + storageRequest: 10Gi networkAttachments: - designate diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml index 15ed60fe52..c7ca633579 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml @@ -69,7 +69,7 @@ spec: databaseInstance: openstack storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi secret: osp-secret keystoneEndpoint: default glanceAPIs: @@ -108,11 +108,11 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 memcached: @@ -241,11 +241,11 @@ spec: ovnDBCluster: ovndbcluster-nb: dbType: NB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovndbcluster-sb: dbType: SB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovnController: networkAttachment: tenant @@ -326,7 +326,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -344,7 +344,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: @@ -482,6 +482,6 @@ spec: designateBackendbind9: replicas: 1 storageClass: local-storage - storageRequest: 10G + storageRequest: 10Gi networkAttachments: - designate 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 8227c658ce..678abf2906 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml @@ -93,7 +93,7 @@ spec: swift_store_key = {{ .ServicePassword }} storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi secret: osp-secret keystoneEndpoint: default glanceAPIs: @@ -132,11 +132,11 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 3 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 3 memcached: @@ -241,11 +241,11 @@ spec: ovnDBCluster: ovndbcluster-nb: dbType: NB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovndbcluster-sb: dbType: SB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovnController: networkAttachment: tenant @@ -328,7 +328,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -346,7 +346,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: @@ -438,6 +438,6 @@ spec: designateBackendbind9: replicas: 1 storageClass: local-storage - storageRequest: 10G + storageRequest: 10Gi networkAttachments: - designate 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 50d3190251..f610f1a6a6 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 @@ -93,7 +93,7 @@ spec: swift_store_key = {{ .ServicePassword }} storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi secret: osp-secret keystoneEndpoint: default glanceAPIs: @@ -132,11 +132,11 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 3 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 3 memcached: @@ -209,11 +209,11 @@ spec: ovnDBCluster: ovndbcluster-nb: dbType: NB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovndbcluster-sb: dbType: SB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovnController: networkAttachment: tenant @@ -266,7 +266,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_fr1.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_fr1.yaml index 3cc7097de2..4d5c2d6438 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_fr1.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_fr1.yaml @@ -69,7 +69,7 @@ spec: databaseInstance: openstack storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi secret: osp-secret keystoneEndpoint: default glanceAPIs: @@ -106,11 +106,11 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 memcached: @@ -235,11 +235,11 @@ spec: ovnDBCluster: ovndbcluster-nb: dbType: NB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovndbcluster-sb: dbType: SB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovnController: networkAttachment: tenant @@ -320,7 +320,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -338,7 +338,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: @@ -471,6 +471,6 @@ spec: designateBackendbind9: replicas: 1 storageClass: local-storage - storageRequest: 10G + storageRequest: 10Gi networkAttachments: - designate diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index 8b01dc4696..fbbe3e0f93 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -93,7 +93,7 @@ spec: swift_store_key = {{ .ServicePassword }} storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi secret: osp-secret keystoneEndpoint: default glanceAPIs: @@ -132,9 +132,9 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi memcached: templates: memcached: @@ -237,11 +237,11 @@ spec: ovnDBCluster: ovndbcluster-nb: dbType: NB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovndbcluster-sb: dbType: SB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovnController: networkAttachment: tenant @@ -322,7 +322,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -340,7 +340,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: @@ -432,6 +432,6 @@ spec: designateBackendbind9: replicas: 1 storageClass: local-storage - storageRequest: 10G + storageRequest: 10Gi networkAttachments: - designate diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml index c157f710f3..26b270aa84 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml @@ -126,7 +126,7 @@ spec: rbd_store_user = openstack storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi secret: osp-secret keystoneEndpoint: default glanceAPIs: @@ -165,9 +165,9 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi memcached: templates: memcached: @@ -287,11 +287,11 @@ spec: ovnDBCluster: ovndbcluster-nb: dbType: NB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovndbcluster-sb: dbType: SB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovnController: networkAttachment: tenant @@ -372,7 +372,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -390,7 +390,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: @@ -457,6 +457,6 @@ spec: designateBackendbind9: replicas: 1 storageClass: local-storage - storageRequest: 10G + storageRequest: 10Gi networkAttachments: - designate 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 b28093c303..8ed592602f 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 @@ -84,7 +84,7 @@ spec: databaseInstance: openstack storage: storageClass: "" - storageRequest: 10G + storageRequest: 10Gi secret: osp-secret keystoneEndpoint: default customServiceConfig: | @@ -135,9 +135,9 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi memcached: templates: memcached: @@ -240,11 +240,11 @@ spec: ovnDBCluster: ovndbcluster-nb: dbType: NB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovndbcluster-sb: dbType: SB - storageRequest: 10G + storageRequest: 10Gi networkAttachment: internalapi ovnController: networkAttachment: tenant @@ -325,7 +325,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: @@ -343,7 +343,7 @@ spec: strategy: persistent retention: 24h persistent: - pvcStorageRequest: 10G + pvcStorageRequest: 10Gi autoscaling: enabled: false aodh: @@ -435,6 +435,6 @@ spec: designateBackendbind9: replicas: 1 storageClass: local-storage - storageRequest: 10G + storageRequest: 10Gi networkAttachments: - designate diff --git a/test/kuttl/common/assert-sample-deployment.yaml b/test/kuttl/common/assert-sample-deployment.yaml index 75044bff68..5574d57639 100644 --- a/test/kuttl/common/assert-sample-deployment.yaml +++ b/test/kuttl/common/assert-sample-deployment.yaml @@ -12,11 +12,11 @@ spec: enabled: true templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 rabbitmq: @@ -41,7 +41,7 @@ spec: default: replicas: 1 storage: - storageRequest: 10G + storageRequest: 10Gi cinder: template: databaseInstance: openstack @@ -70,11 +70,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: @@ -117,7 +117,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: diff --git a/test/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml b/test/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml index 5e67edc4b0..c944cfa333 100644 --- a/test/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml +++ b/test/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml @@ -11,7 +11,7 @@ spec: galera: templates: openstack: - storageRequest: 500M + storageRequest: 500Mi rabbitmq: templates: rabbitmq: @@ -31,7 +31,7 @@ spec: default: replicas: 1 storage: - storageRequest: 10G + storageRequest: 10Gi cinder: template: databaseInstance: openstack @@ -51,11 +51,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: @@ -97,7 +97,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: diff --git a/test/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml b/test/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml index e579437ac7..e28d527835 100644 --- a/test/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml +++ b/test/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml @@ -12,11 +12,11 @@ spec: enabled: true templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 3 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 3 rabbitmq: @@ -40,7 +40,7 @@ spec: default: replicas: 1 storage: - storageRequest: 10G + storageRequest: 10Gi cinder: template: databaseInstance: openstack @@ -80,11 +80,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: @@ -110,7 +110,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: diff --git a/test/kuttl/tests/ctlplane-tls-cert-rotation/00-assert-deploy-openstack.yaml b/test/kuttl/tests/ctlplane-tls-cert-rotation/00-assert-deploy-openstack.yaml index e62d678d39..bdc67fa8a6 100644 --- a/test/kuttl/tests/ctlplane-tls-cert-rotation/00-assert-deploy-openstack.yaml +++ b/test/kuttl/tests/ctlplane-tls-cert-rotation/00-assert-deploy-openstack.yaml @@ -12,11 +12,11 @@ spec: enabled: true templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 rabbitmq: @@ -41,7 +41,7 @@ spec: default: replicas: 1 storage: - storageRequest: 10G + storageRequest: 10Gi cinder: template: databaseInstance: openstack @@ -70,11 +70,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: @@ -117,7 +117,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: diff --git a/test/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml b/test/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml index 9d9d9973ba..144981300a 100644 --- a/test/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml +++ b/test/kuttl/tests/ctlplane-tls-cert-rotation/03-assert-new-certs.yaml @@ -33,11 +33,11 @@ spec: enabled: true templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 rabbitmq: @@ -62,7 +62,7 @@ spec: default: replicas: 1 storage: - storageRequest: 10G + storageRequest: 10Gi cinder: template: databaseInstance: openstack @@ -91,11 +91,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: @@ -138,7 +138,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: diff --git a/test/kuttl/tests/ctlplane-tls-custom-issuers/01-assert-deploy-openstack.yaml b/test/kuttl/tests/ctlplane-tls-custom-issuers/01-assert-deploy-openstack.yaml index f30aa17240..b6012a58fa 100644 --- a/test/kuttl/tests/ctlplane-tls-custom-issuers/01-assert-deploy-openstack.yaml +++ b/test/kuttl/tests/ctlplane-tls-custom-issuers/01-assert-deploy-openstack.yaml @@ -12,11 +12,11 @@ spec: enabled: true templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 rabbitmq: @@ -41,7 +41,7 @@ spec: default: replicas: 1 storage: - storageRequest: 10G + storageRequest: 10Gi cinder: template: databaseInstance: openstack @@ -70,11 +70,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: @@ -117,7 +117,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: diff --git a/test/kuttl/tests/ctlplane-tls-custom-issuers/09-assert-deploy-openstack.yaml b/test/kuttl/tests/ctlplane-tls-custom-issuers/09-assert-deploy-openstack.yaml index f30aa17240..b6012a58fa 100644 --- a/test/kuttl/tests/ctlplane-tls-custom-issuers/09-assert-deploy-openstack.yaml +++ b/test/kuttl/tests/ctlplane-tls-custom-issuers/09-assert-deploy-openstack.yaml @@ -12,11 +12,11 @@ spec: enabled: true templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 rabbitmq: @@ -41,7 +41,7 @@ spec: default: replicas: 1 storage: - storageRequest: 10G + storageRequest: 10Gi cinder: template: databaseInstance: openstack @@ -70,11 +70,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: @@ -117,7 +117,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: diff --git a/test/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml b/test/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml index 0b2aec0a40..c929877457 100644 --- a/test/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml +++ b/test/kuttl/tests/ctlplane-tls-custom-route/03-assert-deploy-openstack.yaml @@ -12,11 +12,11 @@ spec: enabled: true templates: openstack: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 openstack-cell1: - storageRequest: 500M + storageRequest: 500Mi secret: osp-secret replicas: 1 rabbitmq: @@ -46,7 +46,7 @@ spec: default: replicas: 1 storage: - storageRequest: 10G + storageRequest: 10Gi cinder: template: databaseInstance: openstack @@ -75,11 +75,11 @@ spec: ovndbcluster-nb: replicas: 1 dbType: NB - storageRequest: 10G + storageRequest: 10Gi ovndbcluster-sb: replicas: 1 dbType: SB - storageRequest: 10G + storageRequest: 10Gi ovnNorthd: replicas: 1 ovnController: @@ -122,7 +122,7 @@ spec: replicas: 1 ironicConductors: - replicas: 1 - storageRequest: 10G + storageRequest: 10Gi ironicInspector: replicas: 1 ironicNeutronAgent: