Merge pull request #430 from fmount/improve_kustomize

Do not maintain a copy of the base ctlplane CR

config/samples/backends/base/openstack/kustomization.yaml

@@ -1,2 +1,17 @@
 resources:
-  - openstack.yaml
+  - https://raw.githubusercontent.com/openstack-k8s-operators/openstack-operator/main/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml
+
+patches:
+  - target:
+      kind: OpenStackControlPlane
+      name: .*
+    patch: |-
+      - op: remove
+        path: /spec/glance/template/glanceAPIs/default/type
+  - target:
+      kind: OpenStackControlPlane
+      name: .*
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: openstack

config/samples/backends/ceph/ceph.yaml

@@ -20,13 +20,6 @@ spec:
         rbd_store_user = openstack
       databaseInstance: openstack
       databaseUser: glance
-      glanceAPIs:
-        default:
-          debug:
-            service: false
-          preserveJobs: false
-          replicas: 1
-          type: split
       secret: osp-secret
       storageClass: ""
       storageRequest: 1G

config/samples/backends/cinder/glance-common/glance.yaml

@@ -28,5 +28,6 @@ spec:
             service: false
           preserveJobs: false
           replicas: 1
+          type: split
       storageClass: ""
       storageRequest: 1G

config/samples/backends/cinder/lvm-nvmeof/kustomization.yaml

@@ -4,6 +4,7 @@
   # Whole OpenStack deployment using a Cinder NVMe-TCP LVM backend
 resources:
 - https://github.com/openstack-k8s-operators/cinder-operator/config/samples/backends/lvm/nvme-tcp
+
 components:
 - ../glance-common
 apiVersion: kustomize.config.k8s.io/v1beta1

config/samples/backends/swift/glance.yaml

@@ -27,6 +27,5 @@ spec:
             service: false
           preserveJobs: false
           replicas: 1
-          type: split
       storageClass: ""
       storageRequest: 1G