Do not maintain a copy of the base ctlplane CR

This patch removes the copy of the basic control plane we used to maintain, and it's now added as a reference to the one defined in the openstack-operator repository. The base kustomization.yaml is adapted to the new CR to make sure we can add a per-backend overlay on top without extra issues. By doing this we can always point to the last available ctlplane CR. Signed-off-by: Francesco Pantano <[email protected]>
openstack-k8s-operators · Feb 2, 2024 · bd19bb9 · bd19bb9
1 parent f80cdbc
commit bd19bb9
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 149 deletions.
diff --git a/config/samples/backends/bases/openstack/kustomization.yaml b/config/samples/backends/bases/openstack/kustomization.yaml
@@ -1,4 +1,17 @@
 resources:
-- openstack.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
+  - 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/manila/template/manilaShares
+  - target:
+      kind: OpenStackControlPlane
+      name: .*
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: openstack
diff --git a/config/samples/backends/bases/openstack/openstack.yaml b/config/samples/backends/bases/openstack/openstack.yaml
diff --git a/config/samples/backends/ceph-nfs/backend.yaml b/config/samples/backends/ceph-nfs/backend.yaml
@@ -30,6 +30,8 @@ spec:
               cephfs_nfs_cluster_id=cephfs
               cephfs_protocol_helper_type=NFS
           replicas: 1
+          networkAttachments:
+          - storage
   extraMounts:
     - name: v1
       region: r1

diff --git a/config/samples/backends/cephfs/backend.yaml b/config/samples/backends/cephfs/backend.yaml
@@ -33,6 +33,8 @@ spec:
               cephfs_volume_mode=0755
               cephfs_protocol_helper_type=CEPHFS
           replicas: 1
+          networkAttachments:
+          - storage
   extraMounts:
     - name: v1
       region: r1

diff --git a/config/samples/backends/dhss-netapp/dhss.yaml b/config/samples/backends/dhss-netapp/dhss.yaml
@@ -18,6 +18,8 @@ spec:
         replicas: 1
       manilaShares:
         share1:
+          networkAttachments:
+          - storage
           replicas: 1
           customServiceConfig: |
             [DEFAULT]

diff --git a/config/samples/backends/multibackend/backend.yaml b/config/samples/backends/multibackend/backend.yaml
@@ -20,6 +20,8 @@ spec:
         containerImage: quay.io/tripleozedcentos9/openstack-manila-scheduler:current-tripleo
       manilaShares:
         share1:
+          networkAttachments:
+          - storage
           customServiceConfig: |
               [DEFAULT]
               enabled_share_backends=cephfsnfs
@@ -34,6 +36,8 @@ spec:
           containerImage: quay.io/tripleozedcentos9/openstack-manila-share:current-tripleo
           replicas: 1
         share2:
+          networkAttachments:
+          - storage
           customServiceConfig: |
               [DEFAULT]
               enabled_share_backends=cephfs
@@ -51,6 +55,8 @@ spec:
           containerImage: quay.io/tripleozedcentos9/openstack-manila-share:current-tripleo
           replicas: 1
         share3:
+          networkAttachments:
+          - storage
           customServiceConfig: |
             [DEFAULT]
             debug = true

diff --git a/config/samples/backends/netapp/backend.yaml b/config/samples/backends/netapp/backend.yaml
@@ -18,6 +18,8 @@ spec:
         replicas: 1
       manilaShares:
         share1:
+          networkAttachments:
+          - storage
           customServiceConfig: |
             [DEFAULT]
             debug = true