Fix layout for kuttl testing purposes

Signed-off-by: Francesco Pantano <[email protected]>
openstack-k8s-operators · Jun 17, 2024 · d34128b · d34128b
1 parent a42cf17
commit d34128b
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -23,7 +23,8 @@ spec:
     default:
       replicas: 1
   secret: osp-secret
-  storageRequest: 10G
+  storage:
+    storageRequest: 10G
 status:
   databaseHostname: openstack.glance-kuttl-tests.svc
 ---