From 481287a5da7c48089a340886f9b023d78647e01a Mon Sep 17 00:00:00 2001 From: frenzyfriday Date: Mon, 13 May 2024 13:05:29 +0200 Subject: [PATCH] Changing the metadata: name in samples to a standard name "openstack" Related to: https://issues.redhat.com/browse/OSPRH-4947 --- .../core_v1beta1_openstackcontrolplane.yaml | 2 +- ...beta1_openstackcontrolplane_collapsed_cell.yaml | 2 +- .../core_v1beta1_openstackcontrolplane_galera.yaml | 2 +- ...ta1_openstackcontrolplane_galera_3replicas.yaml | 2 +- ...stackcontrolplane_galera_network_isolation.yaml | 2 +- ...olplane_galera_network_isolation_3replicas.yaml | 2 +- ...on_3replicas_only_default_enabled_services.yaml | 2 +- ...a1_openstackcontrolplane_network_isolation.yaml | 2 +- ...enstackcontrolplane_network_isolation_ceph.yaml | 2 +- ...lane_network_isolation_tls_public_endpoint.yaml | 2 +- tests/kuttl/common/assert-sample-deployment.yaml | 2 +- tests/kuttl/common/errors_cleanup_openstack.yaml | 14 +++++++------- tests/kuttl/tests/basic-deployment/02-cleanup.yaml | 2 +- .../tests/collapsed/01-assert-collapsed-cell.yaml | 2 +- tests/kuttl/tests/collapsed/02-cleanup.yaml | 2 +- .../01-assert-galera-3replicas.yaml | 2 +- tests/kuttl/tests/galera-3replicas/02-cleanup.yaml | 2 +- .../kuttl/tests/galera-basic/01-assert-galera.yaml | 2 +- tests/kuttl/tests/galera-basic/02-cleanup.yaml | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) diff --git a/config/samples/core_v1beta1_openstackcontrolplane.yaml b/config/samples/core_v1beta1_openstackcontrolplane.yaml index 3167b86e4..b85e16e1d 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-basic + name: openstack spec: secret: osp-secret storageClass: local-storage diff --git a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml index 38dd371d6..a963c6a85 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-collapsed-cell + name: openstack spec: secret: osp-secret storageClass: local-storage diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml index fa7bbab83..9e93150ef 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-galera + name: openstack spec: secret: osp-secret storageClass: local-storage diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml index 67b485795..b2cd7f78a 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-galera-3replicas + name: openstack spec: secret: osp-secret storageClass: local-storage diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml index 847396f4b..db8d2f3c3 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-galera-network-isolation + name: openstack spec: secret: osp-secret storageClass: local-storage 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 b71055346..47aed5a3e 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-galera-network-isolation-3replicas + name: openstack spec: secret: osp-secret storageClass: local-storage 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 1cbbed229..cb83ed628 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 @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-galera-network-isolation-3replicas + name: openstack spec: secret: osp-secret storageClass: local-storage diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index c75c526ba..b2ff28eb3 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-network-isolation + name: openstack spec: secret: osp-secret storageClass: local-storage diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml index 836352c6c..c123baa6e 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-network-isolation-ceph + name: openstack spec: secret: osp-secret storageClass: local-storage 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 a9dddcade..9f018aab8 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 @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-network-isolation + name: openstack spec: secret: osp-secret storageClass: local-storage diff --git a/tests/kuttl/common/assert-sample-deployment.yaml b/tests/kuttl/common/assert-sample-deployment.yaml index 6d3ad50ac..dea43f1cb 100644 --- a/tests/kuttl/common/assert-sample-deployment.yaml +++ b/tests/kuttl/common/assert-sample-deployment.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-basic + name: openstack spec: secret: osp-secret keystone: diff --git a/tests/kuttl/common/errors_cleanup_openstack.yaml b/tests/kuttl/common/errors_cleanup_openstack.yaml index dffa784c8..082b16265 100644 --- a/tests/kuttl/common/errors_cleanup_openstack.yaml +++ b/tests/kuttl/common/errors_cleanup_openstack.yaml @@ -15,37 +15,37 @@ metadata: apiVersion: apps/v1 kind: StatefulSet metadata: - name: openstack-galera + name: openstack --- apiVersion: v1 kind: Pod metadata: - name: openstack-galera-0 + name: openstack --- apiVersion: v1 kind: Pod metadata: - name: openstack-galera-1 + name: openstack --- apiVersion: v1 kind: Pod metadata: - name: openstack-galera-2 + name: openstack --- apiVersion: v1 kind: Service metadata: - name: openstack-galera + name: openstack --- apiVersion: v1 kind: Endpoints metadata: - name: openstack-galera + name: openstack --- apiVersion: v1 kind: ConfigMap metadata: - name: openstack-config-data + name: openstack --- apiVersion: ovn.openstack.org/v1beta1 kind: OVNNorthd diff --git a/tests/kuttl/tests/basic-deployment/02-cleanup.yaml b/tests/kuttl/tests/basic-deployment/02-cleanup.yaml index 41d34afad..a8bb50add 100644 --- a/tests/kuttl/tests/basic-deployment/02-cleanup.yaml +++ b/tests/kuttl/tests/basic-deployment/02-cleanup.yaml @@ -3,7 +3,7 @@ kind: TestStep delete: - apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane - name: openstack-basic + name: openstack commands: - script: | oc delete --ignore-not-found=true -n $NAMESPACE pvc \ diff --git a/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml b/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml index 3d36276f0..d0ad44c15 100644 --- a/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml +++ b/tests/kuttl/tests/collapsed/01-assert-collapsed-cell.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-collapsed-cell + name: openstack spec: secret: osp-secret keystone: diff --git a/tests/kuttl/tests/collapsed/02-cleanup.yaml b/tests/kuttl/tests/collapsed/02-cleanup.yaml index 455b07e46..44141c89f 100644 --- a/tests/kuttl/tests/collapsed/02-cleanup.yaml +++ b/tests/kuttl/tests/collapsed/02-cleanup.yaml @@ -3,4 +3,4 @@ kind: TestStep delete: - apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane - name: openstack-collapsed-cell + name: openstack diff --git a/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml b/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml index 845d3fab2..fa9c70a66 100644 --- a/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml +++ b/tests/kuttl/tests/galera-3replicas/01-assert-galera-3replicas.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-galera-3replicas + name: openstack spec: secret: osp-secret keystone: diff --git a/tests/kuttl/tests/galera-3replicas/02-cleanup.yaml b/tests/kuttl/tests/galera-3replicas/02-cleanup.yaml index 095e1978f..c5ae88681 100644 --- a/tests/kuttl/tests/galera-3replicas/02-cleanup.yaml +++ b/tests/kuttl/tests/galera-3replicas/02-cleanup.yaml @@ -3,7 +3,7 @@ kind: TestStep delete: - apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane - name: openstack-galera-3replicas + name: openstack commands: - script: | oc delete --ignore-not-found=true -n $NAMESPACE pvc \ diff --git a/tests/kuttl/tests/galera-basic/01-assert-galera.yaml b/tests/kuttl/tests/galera-basic/01-assert-galera.yaml index 7c8d13a91..8370ec24e 100644 --- a/tests/kuttl/tests/galera-basic/01-assert-galera.yaml +++ b/tests/kuttl/tests/galera-basic/01-assert-galera.yaml @@ -1,7 +1,7 @@ apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane metadata: - name: openstack-galera + name: openstack spec: secret: osp-secret keystone: diff --git a/tests/kuttl/tests/galera-basic/02-cleanup.yaml b/tests/kuttl/tests/galera-basic/02-cleanup.yaml index 7dd0adf99..d7ec666cf 100644 --- a/tests/kuttl/tests/galera-basic/02-cleanup.yaml +++ b/tests/kuttl/tests/galera-basic/02-cleanup.yaml @@ -3,7 +3,7 @@ kind: TestStep delete: - apiVersion: core.openstack.org/v1beta1 kind: OpenStackControlPlane - name: openstack-galera + name: openstack commands: - script: | oc delete --ignore-not-found=true -n $NAMESPACE pvc \