migrate from databaseUsername to databaseAccount

openstack-k8s-operators · Feb 19, 2024 · afabfa2 · afabfa2
1 parent 3d2d261
commit afabfa2
Show file tree

Hide file tree

Showing 33 changed files with 124 additions and 96 deletions.
diff --git a/api/bases/glance.openstack.org_glanceapis.yaml b/api/bases/glance.openstack.org_glanceapis.yaml
@@ -55,11 +55,11 @@ spec:
                 items:
                   type: string
                 type: array
-              databaseHostname:
-                type: string
-              databaseUser:
+              databaseAccount:
                 default: glance
                 type: string
+              databaseHostname:
+                type: string
               extraMounts:
                 items:
                   properties:
@@ -880,12 +880,8 @@ spec:
                 type: object
               passwordSelectors:
                 default:
-                  database: GlanceDatabasePassword
                   service: GlancePassword
                 properties:
-                  database:
-                    default: GlanceDatabasePassword
-                    type: string
                   service:
                     default: GlancePassword
                     type: string

diff --git a/api/bases/glance.openstack.org_glances.yaml b/api/bases/glance.openstack.org_glances.yaml
@@ -44,11 +44,11 @@ spec:
                 items:
                   type: string
                 type: array
-              databaseInstance:
-                type: string
-              databaseUser:
+              databaseAccount:
                 default: glance
                 type: string
+              databaseInstance:
+                type: string
               dbPurge:
                 properties:
                   age:
@@ -980,12 +980,8 @@ spec:
                 type: object
               passwordSelectors:
                 default:
-                  database: GlanceDatabasePassword
                   service: GlancePassword
                 properties:
-                  database:
-                    default: GlanceDatabasePassword
-                    type: string
                   service:
                     default: GlancePassword
                     type: string

diff --git a/api/v1beta1/glance_types.go b/api/v1beta1/glance_types.go
@@ -52,16 +52,20 @@ type GlanceSpec struct {
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=glance
-	// DatabaseUser - optional username used for glance DB, defaults to glance
-	// TODO: -> implement needs work in mariadb-operator, right now only glance
-	DatabaseUser string `json:"databaseUser"`
+	// DatabaseAccount - name of MariaDBAccount which will be used to connect.
+	// As an interim solution, glance-controller will
+	// generate the MariaDBAccount object of the given name if it's not
+	// present in the cluster.  Later, openstack-operator will perform this
+	// generation and also populate this field for the Glance objects it creates
+	DatabaseAccount string `json:"databaseAccount"`
 
 	// +kubebuilder:validation:Required
-	// Secret containing OpenStack password information for glance GlanceDatabasePassword
+	// Secret containing OpenStack password information for glance's keystone
+	// password; no longer used for database password
 	Secret string `json:"secret"`
 
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default={database: GlanceDatabasePassword, service: GlancePassword}
+	// +kubebuilder:default={service: GlancePassword}
 	// PasswordSelectors - Selectors to identify the DB and ServiceUser password from the Secret
 	PasswordSelectors PasswordSelector `json:"passwordSelectors"`
 
@@ -131,11 +135,6 @@ type GlanceSpec struct {
 
 // PasswordSelector to identify the DB and AdminUser password from the Secret
 type PasswordSelector struct {
-	// +kubebuilder:validation:Optional
-	// +kubebuilder:default="GlanceDatabasePassword"
-	// Database - Selector to get the glance database user password from the Secret
-	// TODO: not used, need change in mariadb-operator
-	Database string `json:"database"`
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default="GlancePassword"
 	// Service - Selector to get the glance service password from the Secret

diff --git a/api/v1beta1/glanceapi_types.go b/api/v1beta1/glanceapi_types.go
@@ -55,16 +55,19 @@ type GlanceAPISpec struct {
 
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=glance
-	// DatabaseUser - optional username used for glance DB, defaults to glance
-	// TODO: -> implement needs work in mariadb-operator, right now only glance
-	DatabaseUser string `json:"databaseUser"`
+	// DatabaseAccount - name of MariaDBAccount which will be used to connect.
+	// As an interim solution, glance-controller will
+	// generate the MariaDBAccount object of the given name if it's not
+	// present in the cluster.  Later, openstack-operator will perform this
+	// generation and also populate this field for the Glance objects it creates
+	DatabaseAccount string `json:"databaseAccount"`
 
 	// +kubebuilder:validation:Required
 	// Secret containing OpenStack password information for glance AdminPassword
 	Secret string `json:"secret"`
 
 	// +kubebuilder:validation:Optional
-	// +kubebuilder:default={database: GlanceDatabasePassword, service: GlancePassword}
+	// +kubebuilder:default={service: GlancePassword}
 	// PasswordSelectors - Selectors to identify the DB and ServiceUser password from the Secret
 	PasswordSelectors PasswordSelector `json:"passwordSelectors"`
 

diff --git a/config/crd/bases/glance.openstack.org_glanceapis.yaml b/config/crd/bases/glance.openstack.org_glanceapis.yaml
@@ -55,11 +55,11 @@ spec:
                 items:
                   type: string
                 type: array
-              databaseHostname:
-                type: string
-              databaseUser:
+              databaseAccount:
                 default: glance
                 type: string
+              databaseHostname:
+                type: string
               extraMounts:
                 items:
                   properties:
@@ -880,12 +880,8 @@ spec:
                 type: object
               passwordSelectors:
                 default:
-                  database: GlanceDatabasePassword
                   service: GlancePassword
                 properties:
-                  database:
-                    default: GlanceDatabasePassword
-                    type: string
                   service:
                     default: GlancePassword
                     type: string

diff --git a/config/crd/bases/glance.openstack.org_glances.yaml b/config/crd/bases/glance.openstack.org_glances.yaml
@@ -44,11 +44,11 @@ spec:
                 items:
                   type: string
                 type: array
-              databaseInstance:
-                type: string
-              databaseUser:
+              databaseAccount:
                 default: glance
                 type: string
+              databaseInstance:
+                type: string
               dbPurge:
                 properties:
                   age:
@@ -980,12 +980,8 @@ spec:
                 type: object
               passwordSelectors:
                 default:
-                  database: GlanceDatabasePassword
                   service: GlancePassword
                 properties:
-                  database:
-                    default: GlanceDatabasePassword
-                    type: string
                   service:
                     default: GlancePassword
                     type: string

diff --git a/config/manifests/bases/glance-operator.clusterserviceversion.yaml b/config/manifests/bases/glance-operator.clusterserviceversion.yaml
@@ -18,11 +18,19 @@ spec:
       displayName: Glance API
       kind: GlanceAPI
       name: glanceapis.glance.openstack.org
+      specDescriptors:
+      - description: TLS - Parameters related to the TLS
+        displayName: TLS
+        path: tls
       version: v1beta1
     - description: Glance is the Schema for the glances API
       displayName: Glance
       kind: Glance
       name: glances.glance.openstack.org
+      specDescriptors:
+      - description: TLS - Parameters related to the TLS
+        displayName: TLS
+        path: glanceAPIs.tls
       version: v1beta1
   description: Glance Operator
   displayName: Glance Operator

diff --git a/config/samples/backends/ceph/ceph.yaml b/config/samples/backends/ceph/ceph.yaml
@@ -19,7 +19,7 @@ spec:
         rbd_store_pool = images
         rbd_store_user = openstack
       databaseInstance: openstack
-      databaseUser: glance
+      databaseAccount: glance
       secret: osp-secret
       storageClass: ""
       storageRequest: 1G

diff --git a/config/samples/backends/multistore/multistore.yaml b/config/samples/backends/multistore/multistore.yaml
@@ -30,7 +30,7 @@ spec:
         swift_store_user = service:glance
         swift_store_endpoint_type = internalURL
       databaseInstance: openstack
-      databaseUser: glance
+      databaseAccount: glance
       glanceAPIs:
         default:
           debug:

diff --git a/config/samples/glance_v1beta1_glance.yaml b/config/samples/glance_v1beta1_glance.yaml
@@ -9,7 +9,7 @@ spec:
     debug = true
     enabled_backends=foo:bar,foo1:bar1
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   secret: osp-secret
   storageClass: local-storage
   storageRequest: 10G
diff --git a/config/samples/glance_v1beta1_glanceapi.yaml b/config/samples/glance_v1beta1_glanceapi.yaml
@@ -15,7 +15,7 @@ spec:
     here-foo-config
     [foo1]
     here-foo1-config
-  databaseUser: glance
+  databaseAccount: glance
   databaseHostname: glance
   debug:
     dbSync: false

diff --git a/config/samples/image_cache/image-cache.yaml b/config/samples/image_cache/image-cache.yaml
@@ -21,7 +21,7 @@ spec:
         store_description = "RBD backend"
         rbd_store_pool = images
         rbd_store_user = openstack
-      databaseUser: glance
+      databaseAccount: glance
       glanceAPIs:
         default:
           debug:

diff --git a/config/samples/import_plugins/image_conversion/image_conversion.yaml b/config/samples/import_plugins/image_conversion/image_conversion.yaml
@@ -24,7 +24,7 @@ spec:
     [image_conversion]
     output_format = raw
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   glanceAPI:
     debug:
       service: false

diff --git a/config/samples/import_plugins/image_decompression/image_decompression.yaml b/config/samples/import_plugins/image_decompression/image_decompression.yaml
@@ -21,7 +21,7 @@ spec:
     [image_import_opts]
     image_import_plugins = [image_decompression]
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   glanceAPI:
     debug:
       service: false

diff --git a/config/samples/import_plugins/inject_metadata/inject_metadata.yaml b/config/samples/import_plugins/inject_metadata/inject_metadata.yaml
@@ -24,7 +24,7 @@ spec:
     ignore_user_roles = admin,user1
     inject = "property1":"value1","property2":"value2"
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   glanceAPI:
     debug:
       service: false

diff --git a/config/samples/layout/base/glance_v1beta1_glance.yaml b/config/samples/layout/base/glance_v1beta1_glance.yaml
@@ -9,7 +9,7 @@ spec:
     debug = true
     enabled_backends=foo:bar
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   secret: osp-secret
   storageClass: local-storage
   storageRequest: 10G
diff --git a/config/samples/layout/edge/glance_v1beta1_glance.yaml b/config/samples/layout/edge/glance_v1beta1_glance.yaml
@@ -8,7 +8,7 @@ spec:
     [DEFAULT]
     debug = true
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   keystoneEndpoint: central
   glanceAPIs:
     central:

diff --git a/config/samples/layout/multiple/glance_v1beta1_glance.yaml b/config/samples/layout/multiple/glance_v1beta1_glance.yaml
@@ -8,7 +8,7 @@ spec:
     [DEFAULT]
     debug = true
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   keystoneEndpoint: api1
   glanceAPIs:
     api1:

diff --git a/config/samples/layout/single/glance_v1beta1_glance.yaml b/config/samples/layout/single/glance_v1beta1_glance.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   serviceUser: glance
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   keystoneEndpoint: default
   customServiceConfig: |
     [DEFAULT]

diff --git a/config/samples/layout/single_tls/glance_v1beta1_glance.yaml b/config/samples/layout/single_tls/glance_v1beta1_glance.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   serviceUser: glance
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   keystoneEndpoint: default
   customServiceConfig: |
     [DEFAULT]

diff --git a/config/samples/policy/glance_v1beta_glance_apply_policy.yaml b/config/samples/policy/glance_v1beta_glance_apply_policy.yaml
@@ -10,7 +10,7 @@ spec:
     enforce_scope=true
     enforce_new_defaults=true
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   glanceAPI:
     preserveJobs: false
     replicas: 1

diff --git a/config/samples/quotas/glance_v1beta1_glance_quota.yaml b/config/samples/quotas/glance_v1beta1_glance_quota.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   serviceUser: glance
   databaseInstance: openstack
-  databaseUser: glance
+  databaseAccount: glance
   keystoneEndpoint: default
   glanceAPIs:
     default: