Merge pull request #606 from fmount/storage_interface

Fix samples to make sure the new storage interface is used
openstack-k8s-operators · Aug 14, 2024 · a3bcd15 · a3bcd15
2 parents 8421aeb + 7ac02f0
commit a3bcd15
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 21 deletions.
diff --git a/config/samples/backends/ceph/ceph.yaml b/config/samples/backends/ceph/ceph.yaml
@@ -21,8 +21,9 @@ spec:
       databaseInstance: openstack
       databaseAccount: glance
       secret: osp-secret
-      storageClass: ""
-      storageRequest: 1G
+      storage:
+        storageClass: ""
+        storageRequest: 1G
   extraMounts:
     - name: v1
       region: r1

diff --git a/config/samples/backends/cinder/glance-common/glance.yaml b/config/samples/backends/cinder/glance-common/glance.yaml
@@ -24,10 +24,11 @@ spec:
         cinder_catalog_info = volumev3::internalURL
         cinder_use_multipath = true
       databaseInstance: openstack
+      storage:
+        storageClass: ""
+        storageRequest: 1G
       glanceAPIs:
         default:
           preserveJobs: false
           replicas: 1
           type: split
-      storageClass: ""
-      storageRequest: 1G
diff --git a/config/samples/backends/edge/edge.yaml b/config/samples/backends/edge/edge.yaml
@@ -10,8 +10,9 @@ spec:
       databaseInstance: openstack
       databaseAccount: glance
       secret: osp-secret
-      storageClass: ""
-      storageRequest: 10G
+      storage:
+        storageClass: ""
+        storageRequest: 10G
       keystoneEndpoint: default
       glanceAPIs:
         default:

diff --git a/config/samples/backends/multistore/multistore.yaml b/config/samples/backends/multistore/multistore.yaml
@@ -36,8 +36,9 @@ spec:
           preserveJobs: false
           replicas: 1
       secret: osp-secret
-      storageClass: ""
-      storageRequest: 1G
+      storage:
+        storageClass: ""
+        storageRequest: 1G
   extraMounts:
     - name: v1
       region: r1

diff --git a/config/samples/backends/swift/glance.yaml b/config/samples/backends/swift/glance.yaml
@@ -21,9 +21,10 @@ spec:
         swift_store_user = service:glance
         swift_store_key = {{ .ServicePassword }}
       databaseInstance: openstack
+      storage:
+        storageClass: ""
+        storageRequest: 1G
       glanceAPIs:
         default:
           preserveJobs: false
           replicas: 1
-      storageClass: ""
-      storageRequest: 1G
diff --git a/config/samples/image_cache/README.md b/config/samples/image_cache/README.md
@@ -22,10 +22,12 @@ parameter:
         ...
         ...
       databaseInstance: openstack
-      storageClass: ""
       imageCacheSize: 10G
-      storageRequest: 10G
-      glanceAPI:
+      storage:
+        storageRequest: 10G
+        storageClass: ""
+      glanceAPIs:
+        default:
         ...
 ...
 ...

diff --git a/config/samples/image_cache/image-cache.yaml b/config/samples/image_cache/image-cache.yaml
@@ -27,8 +27,9 @@ spec:
           preserveJobs: false
           replicas: 1
       secret: osp-secret
-      storageClass: ""
-      storageRequest: 1G
+      storage:
+        storageClass: ""
+        storageRequest: 1G
       imageCacheSize: 10G
   extraMounts:
     - name: v1

diff --git a/config/samples/import_plugins/image_decompression/image_decompression.yaml b/config/samples/import_plugins/image_decompression/image_decompression.yaml
@@ -26,8 +26,9 @@ spec:
     preserveJobs: false
     replicas: 1
   secret: osp-secret
-  storageClass: ""
-  storageRequest: 1G
+  storage:
+    storageClass: ""
+    storageRequest: 1G
   extraMounts:
     - name: v1
       region: r1

diff --git a/config/samples/policy/glance_v1beta_glance_apply_policy.yaml b/config/samples/policy/glance_v1beta_glance_apply_policy.yaml
@@ -15,8 +15,9 @@ spec:
     preserveJobs: false
     replicas: 1
   secret: osp-secret
-  storageClass: ""
-  storageRequest: 10G
+  storage:
+    storageClass: ""
+    storageRequest: 10G
   extraMounts:
     - name: v1
       region: r1

diff --git a/config/samples/quotas/glance_v1beta1_glance_quota.yaml b/config/samples/quotas/glance_v1beta1_glance_quota.yaml
@@ -14,8 +14,9 @@ spec:
       replicas: 1
       type: single
   secret: osp-secret
-  storageClass: ""
-  storageRequest: 1G
+  storage:
+    storageClass: ""
+    storageRequest: 1G
   quotas:
     imageSizeTotal: 1000
     imageStageTotal: 1000