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 17, 2024 · d7281e9 · d7281e9
1 parent 82a2f29
commit d7281e9
Show file tree

Hide file tree

Showing 21 changed files with 82 additions and 56 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-20240603141403-1ad477d065a2
 	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-20240611223414-c013696ad9cc
-	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.20240614091021-67d1c605b0e8
 	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240604091541-cdb648f9a7ac
 	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240604144138-996e41d1af19

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-20240611223414-c013696ad9cc h1:+O8EHGrJ1KNU6abPCkUkl2RQe/MHCGCgpH2t7kPT2iU=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240611223414-c013696ad9cc/go.mod h1:u53p2KRT083miTWA5oQlU4zITB4FXJOzI/eao51CkbE=
-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.20240614091021-67d1c605b0e8 h1:vwvO/6RAzy6kd+AElRaMF3E7C+lZ3HUd8cRx3gfe3l0=
 github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240614091021-67d1c605b0e8/go.mod h1:h7k9mJ8F9Imch6bqXdKB1I6IlF+N7RM2yyOSlFBWMVA=
 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240604091541-cdb648f9a7ac h1:PefPL9dy16A47TmEsjlGbJcM9tmXA75qAxh9jxQ/Vx4=

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/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/openstack-k8s-operators/barbican-operator/api v0.0.0-20240603141403-1ad477d065a2
 	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-20240611223414-c013696ad9cc
-	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.20240614091021-67d1c605b0e8
 	github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240604091541-cdb648f9a7ac
 	github.com/openstack-k8s-operators/infra-operator/apis v0.3.1-0.20240604144138-996e41d1af19

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-20240611223414-c013696ad9cc h1:+O8EHGrJ1KNU6abPCkUkl2RQe/MHCGCgpH2t7kPT2iU=
 github.com/openstack-k8s-operators/designate-operator/api v0.0.0-20240611223414-c013696ad9cc/go.mod h1:u53p2KRT083miTWA5oQlU4zITB4FXJOzI/eao51CkbE=
-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.20240614091021-67d1c605b0e8 h1:vwvO/6RAzy6kd+AElRaMF3E7C+lZ3HUd8cRx3gfe3l0=
 github.com/openstack-k8s-operators/heat-operator/api v0.3.1-0.20240614091021-67d1c605b0e8/go.mod h1:h7k9mJ8F9Imch6bqXdKB1I6IlF+N7RM2yyOSlFBWMVA=
 github.com/openstack-k8s-operators/horizon-operator/api v0.3.1-0.20240604091541-cdb648f9a7ac h1:PefPL9dy16A47TmEsjlGbJcM9tmXA75qAxh9jxQ/Vx4=

diff --git a/pkg/openstack/glance.go b/pkg/openstack/glance.go
@@ -154,8 +154,8 @@ func ReconcileGlance(ctx context.Context, instance *corev1beta1.OpenStackControl
 		if glance.Spec.DatabaseInstance == "" {
 			glance.Spec.DatabaseInstance = "openstack"
 		}
-		if glance.Spec.StorageClass == "" {
-			glance.Spec.StorageClass = instance.Spec.StorageClass
+		if glance.Spec.Storage.StorageClass == "" {
+			glance.Spec.Storage.StorageClass = instance.Spec.StorageClass
 		}
 		// Append globally defined extraMounts to the service's own list.
 		for _, ev := range instance.Spec.ExtraMounts {

diff --git a/tests/kuttl/common/assert-sample-deployment.yaml b/tests/kuttl/common/assert-sample-deployment.yaml
@@ -36,7 +36,8 @@ spec:
   glance:
     template:
       databaseInstance: openstack
-      storageRequest: 10G
+      storage:
+        storageRequest: 10G
       secret: osp-secret
       glanceAPIs:
         default:

diff --git a/tests/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml b/tests/kuttl/tests/ctlplane-collapsed/01-assert-collapsed-cell.yaml
@@ -27,7 +27,8 @@ spec:
   glance:
     template:
       databaseInstance: openstack
-      storageRequest: 10G
+      storage:
+        storageRequest: 10G
       glanceAPIs:
         default:
           replicas: 1

diff --git a/tests/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml b/tests/kuttl/tests/ctlplane-galera-3replicas/01-assert-galera-3replicas.yaml
@@ -36,7 +36,8 @@ spec:
   glance:
     template:
       databaseInstance: openstack
-      storageRequest: 10G
+      storage:
+        storageRequest: 10G
       glanceAPIs:
         default:
           replicas: 1

diff --git a/tests/kuttl/tests/ctlplane-galera-basic/01-assert-galera.yaml b/tests/kuttl/tests/ctlplane-galera-basic/01-assert-galera.yaml
@@ -36,7 +36,8 @@ spec:
   glance:
     template:
       databaseInstance: openstack
-      storageRequest: 10G
+      storage:
+        storageRequest: 10G
       glanceAPIs:
         default:
           replicas: 1