Changing the metadata: name in samples to a standard name "openstack"

Related to: https://issues.redhat.com/browse/OSPRH-4947
openstack-k8s-operators · Jun 10, 2024 · 481287a · 481287a
1 parent 8813d7e
commit 481287a
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...enstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml b/...enstackcontrolplane_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \