migrate from databaseUsername to databaseAccount and fully use Maria…

…DBAccount
openstack-k8s-operators · Mar 11, 2024 · eb8e5ed · eb8e5ed
1 parent 25f01ea
commit eb8e5ed
Show file tree

Hide file tree

Showing 17 changed files with 153 additions and 145 deletions.
diff --git a/api/bases/telemetry.openstack.org_autoscalings.yaml b/api/bases/telemetry.openstack.org_autoscalings.yaml
@@ -48,16 +48,16 @@ spec:
                       content gets added to to /etc/<service>/<service>.conf.d directory
                       as custom.conf file.
                     type: string
+                  databaseAccount:
+                    default: aodh
+                    description: DatabaseAccount - optional MariaDBAccount CR name
+                      used for aodh DB, defaults to aodh
+                    type: string
                   databaseInstance:
                     description: MariaDB instance name Right now required by the maridb-operator
                       to get the credentials from the instance to create the DB Might
                       not be required in future
                     type: string
-                  databaseUser:
-                    default: aodh
-                    description: Database user name Needed to connect to a database
-                      used by aodh
-                    type: string
                   defaultConfigOverwrite:
                     additionalProperties:
                       type: string
@@ -255,7 +255,6 @@ spec:
                   passwordSelector:
                     default:
                       aodhService: AodhPassword
-                      database: AodhDatabasePassword
                     description: PasswordSelectors - Selectors to identify the service
                       from the Secret
                     properties:
@@ -264,11 +263,6 @@ spec:
                         description: AodhService - Selector to get the aodh service
                           password from the Secret
                         type: string
-                      database:
-                        default: AodhDatabasePassword
-                        description: Database - Selector to get the aodh database
-                          user password from the Secret
-                        type: string
                       service:
                         default: CeilometerPassword
                         description: Service - Selector to get the ceilometer service

diff --git a/api/bases/telemetry.openstack.org_ceilometers.yaml b/api/bases/telemetry.openstack.org_ceilometers.yaml
@@ -76,11 +76,6 @@ spec:
                     description: AodhService - Selector to get the aodh service password
                       from the Secret
                     type: string
-                  database:
-                    default: AodhDatabasePassword
-                    description: Database - Selector to get the aodh database user
-                      password from the Secret
-                    type: string
                   service:
                     default: CeilometerPassword
                     description: Service - Selector to get the ceilometer service

diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml
@@ -51,16 +51,16 @@ spec:
                           The content gets added to to /etc/<service>/<service>.conf.d
                           directory as custom.conf file.
                         type: string
+                      databaseAccount:
+                        default: aodh
+                        description: DatabaseAccount - optional MariaDBAccount CR
+                          name used for aodh DB, defaults to aodh
+                        type: string
                       databaseInstance:
                         description: MariaDB instance name Right now required by the
                           maridb-operator to get the credentials from the instance
                           to create the DB Might not be required in future
                         type: string
-                      databaseUser:
-                        default: aodh
-                        description: Database user name Needed to connect to a database
-                          used by aodh
-                        type: string
                       defaultConfigOverwrite:
                         additionalProperties:
                           type: string
@@ -269,7 +269,6 @@ spec:
                       passwordSelector:
                         default:
                           aodhService: AodhPassword
-                          database: AodhDatabasePassword
                         description: PasswordSelectors - Selectors to identify the
                           service from the Secret
                         properties:
@@ -278,11 +277,6 @@ spec:
                             description: AodhService - Selector to get the aodh service
                               password from the Secret
                             type: string
-                          database:
-                            default: AodhDatabasePassword
-                            description: Database - Selector to get the aodh database
-                              user password from the Secret
-                            type: string
                           service:
                             default: CeilometerPassword
                             description: Service - Selector to get the ceilometer
@@ -417,11 +411,6 @@ spec:
                         description: AodhService - Selector to get the aodh service
                           password from the Secret
                         type: string
-                      database:
-                        default: AodhDatabasePassword
-                        description: Database - Selector to get the aodh database
-                          user password from the Secret
-                        type: string
                       service:
                         default: CeilometerPassword
                         description: Service - Selector to get the ceilometer service

diff --git a/api/v1beta1/autoscaling_types.go b/api/v1beta1/autoscaling_types.go
@@ -68,13 +68,13 @@ type AodhCore struct {
 	// Might not be required in future
 	DatabaseInstance string `json:"databaseInstance"`
 
-	// Database user name
-	// Needed to connect to a database used by aodh
+	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=aodh
-	DatabaseUser string `json:"databaseUser,omitempty"`
+	// DatabaseAccount - optional MariaDBAccount CR name used for aodh DB, defaults to aodh
+	DatabaseAccount string `json:"databaseAccount"`
 
 	// PasswordSelectors - Selectors to identify the service from the Secret
-	// +kubebuilder:default:={aodhService: AodhPassword, database: AodhDatabasePassword}
+	// +kubebuilder:default:={aodhService: AodhPassword}
 	PasswordSelectors PasswordsSelector `json:"passwordSelector,omitempty"`
 
 	// ServiceUser - optional username used for this service to register in keystone

diff --git a/api/v1beta1/telemetry_types.go b/api/v1beta1/telemetry_types.go
@@ -36,11 +36,6 @@ type PasswordsSelector struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default:=AodhPassword
 	AodhService string `json:"aodhService"`
-
-	// Database - Selector to get the aodh database user password from the Secret
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default:=AodhDatabasePassword
-	Database string `json:"database"`
 }
 
 // TelemetrySpec defines the desired state of Telemetry

diff --git a/config/crd/bases/telemetry.openstack.org_autoscalings.yaml b/config/crd/bases/telemetry.openstack.org_autoscalings.yaml
@@ -48,16 +48,16 @@ spec:
                       content gets added to to /etc/<service>/<service>.conf.d directory
                       as custom.conf file.
                     type: string
+                  databaseAccount:
+                    default: aodh
+                    description: DatabaseAccount - optional MariaDBAccount CR name
+                      used for aodh DB, defaults to aodh
+                    type: string
                   databaseInstance:
                     description: MariaDB instance name Right now required by the maridb-operator
                       to get the credentials from the instance to create the DB Might
                       not be required in future
                     type: string
-                  databaseUser:
-                    default: aodh
-                    description: Database user name Needed to connect to a database
-                      used by aodh
-                    type: string
                   defaultConfigOverwrite:
                     additionalProperties:
                       type: string
@@ -255,7 +255,6 @@ spec:
                   passwordSelector:
                     default:
                       aodhService: AodhPassword
-                      database: AodhDatabasePassword
                     description: PasswordSelectors - Selectors to identify the service
                       from the Secret
                     properties:
@@ -264,11 +263,6 @@ spec:
                         description: AodhService - Selector to get the aodh service
                           password from the Secret
                         type: string
-                      database:
-                        default: AodhDatabasePassword
-                        description: Database - Selector to get the aodh database
-                          user password from the Secret
-                        type: string
                       service:
                         default: CeilometerPassword
                         description: Service - Selector to get the ceilometer service

diff --git a/config/crd/bases/telemetry.openstack.org_ceilometers.yaml b/config/crd/bases/telemetry.openstack.org_ceilometers.yaml
@@ -76,11 +76,6 @@ spec:
                     description: AodhService - Selector to get the aodh service password
                       from the Secret
                     type: string
-                  database:
-                    default: AodhDatabasePassword
-                    description: Database - Selector to get the aodh database user
-                      password from the Secret
-                    type: string
                   service:
                     default: CeilometerPassword
                     description: Service - Selector to get the ceilometer service

diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml
@@ -51,16 +51,16 @@ spec:
                           The content gets added to to /etc/<service>/<service>.conf.d
                           directory as custom.conf file.
                         type: string
+                      databaseAccount:
+                        default: aodh
+                        description: DatabaseAccount - optional MariaDBAccount CR
+                          name used for aodh DB, defaults to aodh
+                        type: string
                       databaseInstance:
                         description: MariaDB instance name Right now required by the
                           maridb-operator to get the credentials from the instance
                           to create the DB Might not be required in future
                         type: string
-                      databaseUser:
-                        default: aodh
-                        description: Database user name Needed to connect to a database
-                          used by aodh
-                        type: string
                       defaultConfigOverwrite:
                         additionalProperties:
                           type: string
@@ -269,7 +269,6 @@ spec:
                       passwordSelector:
                         default:
                           aodhService: AodhPassword
-                          database: AodhDatabasePassword
                         description: PasswordSelectors - Selectors to identify the
                           service from the Secret
                         properties:
@@ -278,11 +277,6 @@ spec:
                             description: AodhService - Selector to get the aodh service
                               password from the Secret
                             type: string
-                          database:
-                            default: AodhDatabasePassword
-                            description: Database - Selector to get the aodh database
-                              user password from the Secret
-                            type: string
                           service:
                             default: CeilometerPassword
                             description: Service - Selector to get the ceilometer
@@ -417,11 +411,6 @@ spec:
                         description: AodhService - Selector to get the aodh service
                           password from the Secret
                         type: string
-                      database:
-                        default: AodhDatabasePassword
-                        description: Database - Selector to get the aodh database
-                          user password from the Secret
-                        type: string
                       service:
                         default: CeilometerPassword
                         description: Service - Selector to get the ceilometer service

diff --git a/config/samples/telemetry_v1beta1_autoscaling.yaml b/config/samples/telemetry_v1beta1_autoscaling.yaml
@@ -12,6 +12,6 @@ spec:
   aodh:
     secret: osp-secret
     passwordSelectors:
-    databaseUser: aodh
+    databaseAccount: aodh
     databaseInstance: openstack
     memcachedInstance: memcached
diff --git a/config/samples/telemetry_v1beta1_autoscaling_tls.yaml b/config/samples/telemetry_v1beta1_autoscaling_tls.yaml
@@ -12,7 +12,7 @@ spec:
   aodh:
     secret: osp-secret
     passwordSelectors:
-    databaseUser: aodh
+    databaseAccount: aodh
     databaseInstance: openstack
     memcachedInstance: memcached
     tls:

diff --git a/config/samples/telemetry_v1beta1_telemetry.yaml b/config/samples/telemetry_v1beta1_telemetry.yaml
@@ -17,7 +17,7 @@ spec:
     enabled: false
     aodh:
       passwordSelectors:
-      databaseUser: aodh
+      databaseAccount: aodh
       databaseInstance: openstack
       memcachedInstance: memcached
       secret: osp-secret