migrate from databaseUsername to databaseAccount

openstack-k8s-operators · Feb 22, 2024 · b0c77c1 · b0c77c1
1 parent 2097677
commit b0c77c1
Show file tree

Hide file tree

Showing 44 changed files with 343 additions and 632 deletions.
diff --git a/api/bases/designate.openstack.org_designateapis.yaml b/api/bases/designate.openstack.org_designateapis.yaml
@@ -84,15 +84,14 @@ spec:
                 items:
                   type: string
                 type: array
+              databaseAccount:
+                default: designate
+                description: DatabaseAccount - name of MariaDBAccount which will be
+                  used to connect.
+                type: string
               databaseHostname:
                 description: DatabaseHostname - Designate Database Hostname
                 type: string
-              databaseUser:
-                default: designate
-                description: 'DatabaseUser - optional username used for designate
-                  DB, defaults to designate TODO: -> implement needs work in mariadb-operator,
-                  right now only designate'
-                type: string
               defaultConfigOverwrite:
                 additionalProperties:
                   type: string
@@ -290,17 +289,10 @@ spec:
                 type: object
               passwordSelectors:
                 default:
-                  database: DesignateDatabasePassword
                   service: DesignatePassword
                 description: PasswordSelectors - Selectors to identify the DB and
                   ServiceUser password from the Secret
                 properties:
-                  database:
-                    default: DesignateDatabasePassword
-                    description: 'Database - Selector to get the designate database
-                      user password from the Secret TODO: not used, need change in
-                      mariadb-operator'
-                    type: string
                   service:
                     default: DesignatePassword
                     description: Service - Selector to get the designate service password
@@ -365,7 +357,7 @@ spec:
                 type: object
               secret:
                 description: Secret containing OpenStack password information for
-                  DesignateDatabasePassword
+                  DesignatePassword
                 type: string
               serviceAccount:
                 description: ServiceAccount - service account name used internally

diff --git a/api/bases/designate.openstack.org_designatebackendbind9s.yaml b/api/bases/designate.openstack.org_designatebackendbind9s.yaml
@@ -80,15 +80,14 @@ spec:
                 items:
                   type: string
                 type: array
+              databaseAccount:
+                default: designate
+                description: DatabaseAccount - name of MariaDBAccount which will be
+                  used to connect.
+                type: string
               databaseHostname:
                 description: DatabaseHostname - Designate Database Hostname
                 type: string
-              databaseUser:
-                default: designate
-                description: 'DatabaseUser - optional username used for designate
-                  DB, defaults to designate TODO: -> implement needs work in mariadb-operator,
-                  right now only designate'
-                type: string
               defaultConfigOverwrite:
                 additionalProperties:
                   type: string
@@ -112,17 +111,10 @@ spec:
                 type: object
               passwordSelectors:
                 default:
-                  database: DesignateDatabasePassword
                   service: DesignatePassword
                 description: PasswordSelectors - Selectors to identify the DB and
                   ServiceUser password from the Secret
                 properties:
-                  database:
-                    default: DesignateDatabasePassword
-                    description: 'Database - Selector to get the designate database
-                      user password from the Secret TODO: not used, need change in
-                      mariadb-operator'
-                    type: string
                   service:
                     default: DesignatePassword
                     description: Service - Selector to get the designate service password
@@ -187,7 +179,7 @@ spec:
                 type: object
               secret:
                 description: Secret containing OpenStack password information for
-                  DesignateDatabasePassword
+                  DesignatePassword
                 type: string
               serviceAccount:
                 description: ServiceAccount - service account name used internally

diff --git a/api/bases/designate.openstack.org_designatecentrals.yaml b/api/bases/designate.openstack.org_designatecentrals.yaml
@@ -84,15 +84,14 @@ spec:
                 items:
                   type: string
                 type: array
+              databaseAccount:
+                default: designate
+                description: DatabaseAccount - name of MariaDBAccount which will be
+                  used to connect.
+                type: string
               databaseHostname:
                 description: DatabaseHostname - Designate Database Hostname
                 type: string
-              databaseUser:
-                default: designate
-                description: 'DatabaseUser - optional username used for designate
-                  DB, defaults to designate TODO: -> implement needs work in mariadb-operator,
-                  right now only designate'
-                type: string
               defaultConfigOverwrite:
                 additionalProperties:
                   type: string
@@ -116,17 +115,10 @@ spec:
                 type: object
               passwordSelectors:
                 default:
-                  database: DesignateDatabasePassword
                   service: DesignatePassword
                 description: PasswordSelectors - Selectors to identify the DB and
                   ServiceUser password from the Secret
                 properties:
-                  database:
-                    default: DesignateDatabasePassword
-                    description: 'Database - Selector to get the designate database
-                      user password from the Secret TODO: not used, need change in
-                      mariadb-operator'
-                    type: string
                   service:
                     default: DesignatePassword
                     description: Service - Selector to get the designate service password
@@ -191,7 +183,7 @@ spec:
                 type: object
               secret:
                 description: Secret containing OpenStack password information for
-                  DesignateDatabasePassword
+                  DesignatePassword
                 type: string
               serviceAccount:
                 description: ServiceAccount - service account name used internally

diff --git a/api/bases/designate.openstack.org_designatemdnses.yaml b/api/bases/designate.openstack.org_designatemdnses.yaml
@@ -84,15 +84,14 @@ spec:
                 items:
                   type: string
                 type: array
+              databaseAccount:
+                default: designate
+                description: DatabaseAccount - name of MariaDBAccount which will be
+                  used to connect.
+                type: string
               databaseHostname:
                 description: DatabaseHostname - Designate Database Hostname
                 type: string
-              databaseUser:
-                default: designate
-                description: 'DatabaseUser - optional username used for designate
-                  DB, defaults to designate TODO: -> implement needs work in mariadb-operator,
-                  right now only designate'
-                type: string
               defaultConfigOverwrite:
                 additionalProperties:
                   type: string
@@ -116,17 +115,10 @@ spec:
                 type: object
               passwordSelectors:
                 default:
-                  database: DesignateDatabasePassword
                   service: DesignatePassword
                 description: PasswordSelectors - Selectors to identify the DB and
                   ServiceUser password from the Secret
                 properties:
-                  database:
-                    default: DesignateDatabasePassword
-                    description: 'Database - Selector to get the designate database
-                      user password from the Secret TODO: not used, need change in
-                      mariadb-operator'
-                    type: string
                   service:
                     default: DesignatePassword
                     description: Service - Selector to get the designate service password
@@ -191,7 +183,7 @@ spec:
                 type: object
               secret:
                 description: Secret containing OpenStack password information for
-                  DesignateDatabasePassword
+                  DesignatePassword
                 type: string
               serviceAccount:
                 description: ServiceAccount - service account name used internally

diff --git a/api/bases/designate.openstack.org_designateproducers.yaml b/api/bases/designate.openstack.org_designateproducers.yaml
@@ -84,15 +84,14 @@ spec:
                 items:
                   type: string
                 type: array
+              databaseAccount:
+                default: designate
+                description: DatabaseAccount - name of MariaDBAccount which will be
+                  used to connect.
+                type: string
               databaseHostname:
                 description: DatabaseHostname - Designate Database Hostname
                 type: string
-              databaseUser:
-                default: designate
-                description: 'DatabaseUser - optional username used for designate
-                  DB, defaults to designate TODO: -> implement needs work in mariadb-operator,
-                  right now only designate'
-                type: string
               defaultConfigOverwrite:
                 additionalProperties:
                   type: string
@@ -116,17 +115,10 @@ spec:
                 type: object
               passwordSelectors:
                 default:
-                  database: DesignateDatabasePassword
                   service: DesignatePassword
                 description: PasswordSelectors - Selectors to identify the DB and
                   ServiceUser password from the Secret
                 properties:
-                  database:
-                    default: DesignateDatabasePassword
-                    description: 'Database - Selector to get the designate database
-                      user password from the Secret TODO: not used, need change in
-                      mariadb-operator'
-                    type: string
                   service:
                     default: DesignatePassword
                     description: Service - Selector to get the designate service password
@@ -191,7 +183,7 @@ spec:
                 type: object
               secret:
                 description: Secret containing OpenStack password information for
-                  DesignateDatabasePassword
+                  DesignatePassword
                 type: string
               serviceAccount:
                 description: ServiceAccount - service account name used internally