Bump Glance with the new storage interface

We currently provide both StorageClass and StorageRequest that can be propagated to the Glance underlying instances. However, it might be possible that operators use extraMounts to plug a NFS share mapped to /var/lib/glance/os_staging_store. In this case, the API should be updated to not provision any PVC and let the human operator to take care about it using the extraMounts interface. This patch updates the Glance bits to reflect the new behavior introduced in the glance-operator. Signed-off-by: Francesco Pantano <[email protected]>
openstack-k8s-operators · Jun 18, 2024 · 5217e8c · 5217e8c
1 parent 3b9d8a6
commit 5217e8c
Show file tree

Hide file tree

Showing 22 changed files with 106 additions and 78 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -4373,8 +4373,6 @@ spec:
                                     type: object
                                   type: object
                               type: object
-                            pvc:
-                              type: string
                             replicas:
                               default: 1
                               format: int32
@@ -4412,10 +4410,15 @@ spec:
                                     x-kubernetes-int-or-string: true
                                   type: object
                               type: object
-                            storageClass:
-                              type: string
-                            storageRequest:
-                              type: string
+                            storage:
+                              properties:
+                                external:
+                                  type: boolean
+                                storageClass:
+                                  type: string
+                                storageRequest:
+                                  type: string
+                              type: object
                             tls:
                               properties:
                                 api:
@@ -4443,7 +4446,6 @@ spec:
                               type: string
                           required:
                           - containerImage
-                          - storageRequest
                           type: object
                         type: object
                       imageCache:
@@ -4506,18 +4508,22 @@ spec:
                       serviceUser:
                         default: glance
                         type: string
-                      storageClass:
-                        type: string
-                      storageRequest:
-                        type: string
+                      storage:
+                        properties:
+                          external:
+                            type: boolean
+                          storageClass:
+                            type: string
+                          storageRequest:
+                            type: string
+                        type: object
                     required:
                     - databaseInstance
                     - glanceAPIs
                     - imageCache
                     - keystoneEndpoint
                     - memcachedInstance
                     - secret
-                    - storageRequest
                     type: object
                 type: object
               heat:

diff --git a/apis/go.mod b/apis/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240617164203-79f227e25054
 	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f
 	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b
-	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0
+	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240617143817-90d7bb77c86c
 	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0
 	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f
 	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76

diff --git a/apis/go.sum b/apis/go.sum
@@ -96,8 +96,8 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-6
 github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f/go.mod h1:8Wn6ZAPaJshxozJVPI7uq4qrcUXZmECGAPJK7Ed+uGQ=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b h1:KodjRfVnaQt9tRztidjT9F3zpKWmRSc369Z7c1n556c=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b/go.mod h1:sN6FNMjzbVZSuh1IzhnVLXwdKvi8LoxuRRGLGT8CRb4=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0 h1:Wx4xa5Jh/Wa9pAsoCYROJKycesBAy3RBjf/2WnG1Da8=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0/go.mod h1:fYNG/9X9HbQTZkaPo+YLqPu/94dNftw15S58OpQjcZE=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240617143817-90d7bb77c86c h1:QuF1kEWBdCgDy6wqcLXMYzK7nUko/uA1S9I1uvhoKpg=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240617143817-90d7bb77c86c/go.mod h1:fYNG/9X9HbQTZkaPo+YLqPu/94dNftw15S58OpQjcZE=
 github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0 h1:/nQdWwAE/qHonBXFQv57BNt0+ZGvqoaA2wkdKjLHcC4=
 github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0/go.mod h1:BaF3hWIIaZP8boIwhHdYV/Iz4vda7NQuIgh5l/RhXYo=
 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f h1:DckJpHSko5A7ea15fq3HBsqLQYTtRHdCxVygHZWbIOI=

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -4373,8 +4373,6 @@ spec:
                                     type: object
                                   type: object
                               type: object
-                            pvc:
-                              type: string
                             replicas:
                               default: 1
                               format: int32
@@ -4412,10 +4410,15 @@ spec:
                                     x-kubernetes-int-or-string: true
                                   type: object
                               type: object
-                            storageClass:
-                              type: string
-                            storageRequest:
-                              type: string
+                            storage:
+                              properties:
+                                external:
+                                  type: boolean
+                                storageClass:
+                                  type: string
+                                storageRequest:
+                                  type: string
+                              type: object
                             tls:
                               properties:
                                 api:
@@ -4443,7 +4446,6 @@ spec:
                               type: string
                           required:
                           - containerImage
-                          - storageRequest
                           type: object
                         type: object
                       imageCache:
@@ -4506,18 +4508,22 @@ spec:
                       serviceUser:
                         default: glance
                         type: string
-                      storageClass:
-                        type: string
-                      storageRequest:
-                        type: string
+                      storage:
+                        properties:
+                          external:
+                            type: boolean
+                          storageClass:
+                            type: string
+                          storageRequest:
+                            type: string
+                        type: object
                     required:
                     - databaseInstance
                     - glanceAPIs
                     - imageCache
                     - keystoneEndpoint
                     - memcachedInstance
                     - secret
-                    - storageRequest
                     type: object
                 type: object
               heat:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane.yaml b/config/samples/core_v1beta1_openstackcontrolplane.yaml
@@ -56,8 +56,9 @@ spec:
     template:
       secret: osp-secret
       databaseInstance: openstack
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       keystoneEndpoint: default
       glanceAPIs:
         default:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml b/config/samples/core_v1beta1_openstackcontrolplane_collapsed_cell.yaml
@@ -46,8 +46,9 @@ spec:
     template:
       secret: osp-secret
       databaseInstance: openstack
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       keystoneEndpoint: default
       glanceAPIs:
         default:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera.yaml
@@ -54,8 +54,9 @@ spec:
     template:
       secret: osp-secret
       databaseInstance: openstack
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       keystoneEndpoint: default
       glanceAPIs:
         default:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_3replicas.yaml
@@ -53,8 +53,9 @@ spec:
   glance:
     template:
       databaseInstance: openstack
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       secret: osp-secret
       keystoneEndpoint: default
       glanceAPIs:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
@@ -55,8 +55,9 @@ spec:
         route: {}
     template:
       databaseInstance: openstack
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       secret: osp-secret
       keystoneEndpoint: default
       glanceAPIs:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml
@@ -77,8 +77,9 @@ spec:
         route: {}
     template:
       databaseInstance: openstack
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       secret: osp-secret
       keystoneEndpoint: default
       glanceAPIs:

diff --git a/...enstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml b/...enstackcontrolplane_galera_network_isolation_3replicas_only_default_enabled_services.yaml
@@ -77,8 +77,9 @@ spec:
         route: {}
     template:
       databaseInstance: openstack
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       secret: osp-secret
       keystoneEndpoint: default
       glanceAPIs:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml
@@ -77,8 +77,9 @@ spec:
         route: {}
     template:
       databaseInstance: openstack
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       secret: osp-secret
       keystoneEndpoint: default
       glanceAPIs:

diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml
@@ -122,8 +122,9 @@ spec:
         store_description = "RBD backend"
         rbd_store_pool = images
         rbd_store_user = openstack
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       secret: osp-secret
       keystoneEndpoint: default
       glanceAPIs:

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
@@ -80,8 +80,9 @@ spec:
         route: {}
     template:
       databaseInstance: openstack
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       secret: osp-secret
       keystoneEndpoint: default
       glanceAPIs:

diff --git a/docs/assemblies/ctlplane_resources.adoc b/docs/assemblies/ctlplane_resources.adoc
@@ -161,6 +161,7 @@
 * <<apioverridespec,APIOverrideSpec>>
 * <<glanceapitemplate,GlanceAPITemplate>>
 * <<imagecache,ImageCache>>
+* <<storage,Storage>>
 * <<dbpurge,DBPurge>>
 * <<glance,Glance>>
 * <<glanceextravolmounts,GlanceExtraVolMounts>>
@@ -5266,11 +5267,6 @@ GlanceAPITemplate defines the desired state of GlanceAPI
 | map[string]string
 | false
 
-| pvc
-| Pvc - Storage claim for file-backed Glance
-| string
-| false
-
 | customServiceConfig
 | CustomServiceConfig - customize the service config using this parameter to change service defaults, or overwrite rendered information using raw OpenStack config format. The content gets added to to /etc/+++<service>+++/+++<service>+++.conf.d directory as custom.conf file.+++</service>++++++</service>+++
 | string
@@ -5296,16 +5292,11 @@ GlanceAPITemplate defines the desired state of GlanceAPI
 | <<apioverridespec,APIOverrideSpec>>
 | false
 
-| storageClass
-| StorageClass
-| string
+| storage
+| Storage -
+| <<storage,Storage>>
 | false
 
-| storageRequest
-| StorageRequest
-| string
-| true
-
 | type
 | Type - represents the layout of the glanceAPI deployment.
 | string
@@ -5355,6 +5346,30 @@ ImageCache - struct where the exposed imageCache params are defined
 
 <<custom-resources,Back to Custom Resources>>
 
+[#storage]
+==== Storage
+
+|===
+| Field | Description | Scheme | Required
+
+| storageClass
+| StorageClass -
+| string
+| false
+
+| storageRequest
+| StorageRequest -
+| string
+| false
+
+| external
+| External -
+| bool
+| false
+|===
+
+<<custom-resources,Back to Custom Resources>>
+
 [#dbpurge-2]
 ==== DBPurge
 
@@ -5523,16 +5538,11 @@ GlanceSpec defines the desired state of Glance
 | []string
 | false
 
-| storageClass
-| StorageClass
-| string
+| storage
+| Storage -
+| <<storage,Storage>>
 | false
 
-| storageRequest
-| StorageRequest
-| string
-| true
-
 | glanceAPIs
 | GlanceAPIs - Spec definition for the API service of this Glance deployment
 | map[string]<<glanceapitemplate,GlanceAPITemplate>>
@@ -15375,7 +15385,7 @@ PersistentStorage defines storage options used for persistent storage
 
 <<custom-resources,Back to Custom Resources>>
 
-[#storage]
+[#storage-2]
 ==== Storage
 
 Storage defines the options used for storage of metrics

diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240617164203-79f227e25054
 	github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f
 	github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b
-	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0
+	github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240617143817-90d7bb77c86c
 	github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0
 	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f
 	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240617061457-9ce4f0e12b76

diff --git a/go.sum b/go.sum
@@ -104,8 +104,8 @@ github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-6
 github.com/openstack-k8s-operators/cinder-operator/api v0.3.1-0.20240612161940-604036e71c7f/go.mod h1:8Wn6ZAPaJshxozJVPI7uq4qrcUXZmECGAPJK7Ed+uGQ=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b h1:KodjRfVnaQt9tRztidjT9F3zpKWmRSc369Z7c1n556c=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240617072628-d9a4e3570a7b/go.mod h1:sN6FNMjzbVZSuh1IzhnVLXwdKvi8LoxuRRGLGT8CRb4=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0 h1:Wx4xa5Jh/Wa9pAsoCYROJKycesBAy3RBjf/2WnG1Da8=
-github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240616104609-e296d336e2d0/go.mod h1:fYNG/9X9HbQTZkaPo+YLqPu/94dNftw15S58OpQjcZE=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240617143817-90d7bb77c86c h1:QuF1kEWBdCgDy6wqcLXMYzK7nUko/uA1S9I1uvhoKpg=
+github.com/openstack-k8s-operators/glance-operator/api v0.3.1-0.20240617143817-90d7bb77c86c/go.mod h1:fYNG/9X9HbQTZkaPo+YLqPu/94dNftw15S58OpQjcZE=
 github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0 h1:/nQdWwAE/qHonBXFQv57BNt0+ZGvqoaA2wkdKjLHcC4=
 github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240617071814-4b53828cc9b0/go.mod h1:BaF3hWIIaZP8boIwhHdYV/Iz4vda7NQuIgh5l/RhXYo=
 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240617072342-155b98fbba7f h1:DckJpHSko5A7ea15fq3HBsqLQYTtRHdCxVygHZWbIOI=