Merge pull request #774 from vyzigold/update_crs

Update telemetry.autoscaling in sample CRs
openstack-k8s-operators · Apr 29, 2024 · dfd1e47 · dfd1e47
2 parents 9efbf53 + cde0545
commit dfd1e47
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 20 deletions.
diff --git a/config/samples/core_v1beta1_openstackcontrolplane.yaml b/config/samples/core_v1beta1_openstackcontrolplane.yaml
@@ -150,9 +150,8 @@ spec:
         enabled: false
         aodh:
           passwordSelectors:
-          databaseUser: aodh
+          databaseAccount: aodh
           databaseInstance: openstack
-          memcachedInstance: memcached
           secret: osp-secret
         heatInstance: heat
       ceilometer:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml
@@ -136,9 +136,8 @@ spec:
         enabled: false
         aodh:
           passwordSelectors:
-          databaseUser: aodh
+          databaseAccount: aodh
           databaseInstance: openstack
-          memcachedInstance: memcached
           secret: osp-secret
         heatInstance: heat
       ceilometer:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
@@ -148,9 +148,8 @@ spec:
         enabled: false
         aodh:
           passwordSelectors:
-          databaseUser: aodh
+          databaseAccount: aodh
           databaseInstance: openstack
-          memcachedInstance: memcached
           secret: osp-secret
         heatInstance: heat
       ceilometer:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml
@@ -138,9 +138,8 @@ spec:
         enabled: false
         aodh:
           passwordSelectors:
-          databaseUser: aodh
+          databaseAccount: aodh
           databaseInstance: openstack
-          memcachedInstance: memcached
           secret: osp-secret
         heatInstance: heat
       ceilometer:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
@@ -315,9 +315,8 @@ spec:
         enabled: false
         aodh:
           passwordSelectors:
-          databaseUser: aodh
+          databaseAccount: aodh
           databaseInstance: openstack
-          memcachedInstance: memcached
           secret: osp-secret
         heatInstance: heat
       ceilometer:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml
@@ -317,9 +317,8 @@ spec:
         enabled: false
         aodh:
           passwordSelectors:
-          databaseUser: aodh
+          databaseAccount: aodh
           databaseInstance: openstack
-          memcachedInstance: memcached
           secret: osp-secret
         heatInstance: heat
       ceilometer:

diff --git a/...enstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml b/...enstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml
@@ -238,9 +238,8 @@ spec:
         enabled: false
         aodh:
           passwordSelectors:
-          databaseUser: aodh
+          databaseAccount: aodh
           databaseInstance: openstack
-          memcachedInstance: memcached
           secret: osp-secret
         heatInstance: heat
       ceilometer:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml
@@ -311,9 +311,8 @@ spec:
         enabled: false
         aodh:
           passwordSelectors:
-          databaseUser: aodh
+          databaseAccount: aodh
           databaseInstance: openstack
-          memcachedInstance: memcached
           secret: osp-secret
         heatInstance: heat
       ceilometer:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml
@@ -372,9 +372,8 @@ spec:
         enabled: false
         aodh:
           passwordSelectors:
-          databaseUser: aodh
+          databaseAccount: aodh
           databaseInstance: openstack
-          memcachedInstance: memcached
           secret: osp-secret
         heatInstance: heat
       ceilometer:

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
@@ -314,9 +314,8 @@ spec:
         enabled: false
         aodh:
           passwordSelectors:
-          databaseUser: aodh
+          databaseAccount: aodh
           databaseInstance: openstack
-          memcachedInstance: memcached
           secret: osp-secret
         heatInstance: heat
       ceilometer: