From d34128b85742fb55356b5868328d896181e566f2 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Tue, 11 Jun 2024 17:21:00 +0200 Subject: [PATCH] Fix layout for kuttl testing purposes Signed-off-by: Francesco Pantano --- api/v1beta1/glance_webhook.go | 5 +++++ config/samples/glance_v1beta1_glance.yaml | 5 +++-- config/samples/glance_v1beta1_glanceapi.yaml | 3 ++- config/samples/layout/base/glance_v1beta1_glance.yaml | 2 -- config/samples/layout/edge/glance_v1beta1_glance.yaml | 5 +++-- config/samples/layout/multiple/glance_v1beta1_glance.yaml | 5 +++-- config/samples/layout/single/glance_v1beta1_glance.yaml | 5 +++-- .../samples/layout/single_tls/glance_v1beta1_glance.yaml | 5 +++-- config/samples/layout/split/glance_v1beta1_glance.yaml | 6 +++--- controllers/glanceapi_controller.go | 3 +-- docs/dev/design-decisions.md | 7 ------- test/kuttl/tests/glance_image_cache/01-assert.yaml | 3 ++- test/kuttl/tests/glance_image_cache/02-assert.yaml | 2 -- test/kuttl/tests/glance_image_cache/03-assert.yaml | 2 -- test/kuttl/tests/glance_single/01-assert.yaml | 3 ++- test/kuttl/tests/glance_split/01-assert.yaml | 3 ++- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/api/v1beta1/glance_webhook.go b/api/v1beta1/glance_webhook.go index ffb0b392..8286a954 100644 --- a/api/v1beta1/glance_webhook.go +++ b/api/v1beta1/glance_webhook.go @@ -97,6 +97,11 @@ func GetTemplateBackend() string { func (r *GlanceSpecCore) Default() { var rep int32 = 0 + // If no storage request has been made, do not provision PVCs + if r.Storage.StorageRequest == "" { + r.Storage.External = true + } + if r.APITimeout == 0 { r.APITimeout = glanceDefaults.APITimeout } diff --git a/config/samples/glance_v1beta1_glance.yaml b/config/samples/glance_v1beta1_glance.yaml index e203abbe..1ba9872a 100644 --- a/config/samples/glance_v1beta1_glance.yaml +++ b/config/samples/glance_v1beta1_glance.yaml @@ -11,5 +11,6 @@ spec: databaseInstance: openstack databaseAccount: glance secret: osp-secret - storageClass: local-storage - storageRequest: 10G + storage: + storageClass: local-storage + storageRequest: 10G diff --git a/config/samples/glance_v1beta1_glanceapi.yaml b/config/samples/glance_v1beta1_glanceapi.yaml index 45ab612f..3dff6dac 100644 --- a/config/samples/glance_v1beta1_glanceapi.yaml +++ b/config/samples/glance_v1beta1_glanceapi.yaml @@ -19,7 +19,8 @@ spec: databaseHostname: glance preserveJobs: false replicas: 1 - storageRequest: 10G + storage: + storageRequest: 10G secret: glance-secret #tls: # api: diff --git a/config/samples/layout/base/glance_v1beta1_glance.yaml b/config/samples/layout/base/glance_v1beta1_glance.yaml index 7291a575..0fb18e5c 100644 --- a/config/samples/layout/base/glance_v1beta1_glance.yaml +++ b/config/samples/layout/base/glance_v1beta1_glance.yaml @@ -11,5 +11,3 @@ spec: databaseInstance: openstack 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 index b3ae2c0c..5286bf96 100644 --- a/config/samples/layout/edge/glance_v1beta1_glance.yaml +++ b/config/samples/layout/edge/glance_v1beta1_glance.yaml @@ -24,5 +24,6 @@ spec: replicas: 1 type: single secret: osp-secret - storageClass: local-storage - storageRequest: 10G + storage: + storageClass: local-storage + storageRequest: 10G diff --git a/config/samples/layout/multiple/glance_v1beta1_glance.yaml b/config/samples/layout/multiple/glance_v1beta1_glance.yaml index 3d56d97e..e0cbf162 100644 --- a/config/samples/layout/multiple/glance_v1beta1_glance.yaml +++ b/config/samples/layout/multiple/glance_v1beta1_glance.yaml @@ -20,5 +20,6 @@ spec: replicas: 1 type: single secret: osp-secret - storageClass: local-storage - storageRequest: 10G + storage: + storageClass: local-storage + storageRequest: 10G diff --git a/config/samples/layout/single/glance_v1beta1_glance.yaml b/config/samples/layout/single/glance_v1beta1_glance.yaml index 9d4b4751..b0c063bd 100644 --- a/config/samples/layout/single/glance_v1beta1_glance.yaml +++ b/config/samples/layout/single/glance_v1beta1_glance.yaml @@ -18,5 +18,6 @@ spec: imageCache: size: 2G secret: osp-secret - storageClass: local-storage - storageRequest: 10G + storage: + storageClass: local-storage + storageRequest: 10G diff --git a/config/samples/layout/single_tls/glance_v1beta1_glance.yaml b/config/samples/layout/single_tls/glance_v1beta1_glance.yaml index 31c80ad9..e4bfe652 100644 --- a/config/samples/layout/single_tls/glance_v1beta1_glance.yaml +++ b/config/samples/layout/single_tls/glance_v1beta1_glance.yaml @@ -23,5 +23,6 @@ spec: caBundleSecretName: combined-ca-bundle type: single secret: osp-secret - storageClass: local-storage - storageRequest: 10G + storage: + storageClass: local-storage + storageRequest: 10G diff --git a/config/samples/layout/split/glance_v1beta1_glance.yaml b/config/samples/layout/split/glance_v1beta1_glance.yaml index d59031bc..09de547c 100644 --- a/config/samples/layout/split/glance_v1beta1_glance.yaml +++ b/config/samples/layout/split/glance_v1beta1_glance.yaml @@ -18,7 +18,7 @@ spec: keystoneEndpoint: default glanceAPIs: default: - preserveJobs: false replicas: 1 - storageClass: local-storage - storageRequest: 10G + storage: + storageClass: local-storage + storageRequest: 10G diff --git a/controllers/glanceapi_controller.go b/controllers/glanceapi_controller.go index c2ebc094..7c406b42 100644 --- a/controllers/glanceapi_controller.go +++ b/controllers/glanceapi_controller.go @@ -1376,8 +1376,7 @@ func (r *GlanceAPIReconciler) getEndpointID( // glanceAPIRefresh - delete a StateFulSet when a configuration for a Forbidden // parameter happens: it might be required if we add / remove a backend (including -// ceph) where imageConversion is enabled and a dedicated PVC is created using -// statefulsets volume templates +// ceph) func (r *GlanceAPIReconciler) glanceAPIRefresh( ctx context.Context, h *helper.Helper, diff --git a/docs/dev/design-decisions.md b/docs/dev/design-decisions.md index d2b408ce..451fc010 100644 --- a/docs/dev/design-decisions.md +++ b/docs/dev/design-decisions.md @@ -455,13 +455,6 @@ in the glance-operator we make the following assumptions: considered `Ready` if the number of `Replicas` specified in the `Glance` CR spec is **equal** to the number of available instances (`ReadyCount`). - - - - - - - ## Storage Requirements: PVCs usage and available models Glance requires a `staging area` to manipulate data during an import operation. diff --git a/test/kuttl/tests/glance_image_cache/01-assert.yaml b/test/kuttl/tests/glance_image_cache/01-assert.yaml index bdf916f9..004551ce 100644 --- a/test/kuttl/tests/glance_image_cache/01-assert.yaml +++ b/test/kuttl/tests/glance_image_cache/01-assert.yaml @@ -25,7 +25,8 @@ spec: prunerScheduler: 1 0 * * * size: 2G secret: osp-secret - storageRequest: 10G + storage: + storageRequest: 10G --- apiVersion: glance.openstack.org/v1beta1 kind: GlanceAPI diff --git a/test/kuttl/tests/glance_image_cache/02-assert.yaml b/test/kuttl/tests/glance_image_cache/02-assert.yaml index d7673b2a..38d4aeb5 100644 --- a/test/kuttl/tests/glance_image_cache/02-assert.yaml +++ b/test/kuttl/tests/glance_image_cache/02-assert.yaml @@ -24,8 +24,6 @@ spec: cleanerScheduler: '*/30 * * * *' prunerScheduler: 1 0 * * * size: 2G - secret: osp-secret - storageRequest: 10G --- apiVersion: glance.openstack.org/v1beta1 kind: GlanceAPI diff --git a/test/kuttl/tests/glance_image_cache/03-assert.yaml b/test/kuttl/tests/glance_image_cache/03-assert.yaml index a47d7e0d..f7523a9a 100644 --- a/test/kuttl/tests/glance_image_cache/03-assert.yaml +++ b/test/kuttl/tests/glance_image_cache/03-assert.yaml @@ -25,8 +25,6 @@ spec: cleanerScheduler: '*/30 * * * *' prunerScheduler: 1 0 * * * size: 2G - secret: osp-secret - storageRequest: 10G --- apiVersion: glance.openstack.org/v1beta1 kind: GlanceAPI diff --git a/test/kuttl/tests/glance_single/01-assert.yaml b/test/kuttl/tests/glance_single/01-assert.yaml index 2e055cc1..74ca9ae1 100644 --- a/test/kuttl/tests/glance_single/01-assert.yaml +++ b/test/kuttl/tests/glance_single/01-assert.yaml @@ -22,7 +22,8 @@ spec: replicas: 1 type: "single" secret: osp-secret - storageRequest: 10G + storage: + storageRequest: 10G status: databaseHostname: openstack.glance-kuttl-tests.svc --- diff --git a/test/kuttl/tests/glance_split/01-assert.yaml b/test/kuttl/tests/glance_split/01-assert.yaml index e50bf5d3..4dc4caea 100644 --- a/test/kuttl/tests/glance_split/01-assert.yaml +++ b/test/kuttl/tests/glance_split/01-assert.yaml @@ -23,7 +23,8 @@ spec: default: replicas: 1 secret: osp-secret - storageRequest: 10G + storage: + storageRequest: 10G status: databaseHostname: openstack.glance-kuttl-tests.svc ---