csv: add additional csv changes that other commits bring

add generated csv changes Signed-off-by: Ceph Jenkins <ceph-jenkins@redhat.com>
red-hat-storage · Sep 10, 2024 · d9e4560 · d9e4560
1 parent 1944e64
commit d9e4560
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 6 deletions.
diff --git a/build/csv/ceph/ceph.rook.io_cephobjectstores.yaml b/build/csv/ceph/ceph.rook.io_cephobjectstores.yaml
@@ -1476,11 +1476,44 @@ spec:
                     x-kubernetes-validations:
                     - message: object store shared metadata pool is immutable
                       rule: self == oldSelf
+                  poolPlacements:
+                    items:
+                      properties:
+                        dataNonECPoolName:
+                          type: string
+                        dataPoolName:
+                          minLength: 1
+                          type: string
+                        metadataPoolName:
+                          minLength: 1
+                          type: string
+                        name:
+                          minLength: 1
+                          pattern: ^[a-zA-Z0-9._/-]+$
+                          type: string
+                        storageClasses:
+                          items:
+                            properties:
+                              dataPoolName:
+                                minLength: 1
+                                type: string
+                              name:
+                                minLength: 1
+                                pattern: ^[a-zA-Z0-9._/-]+$
+                                type: string
+                            required:
+                            - dataPoolName
+                            - name
+                            type: object
+                          type: array
+                      required:
+                      - dataPoolName
+                      - metadataPoolName
+                      - name
+                      type: object
+                    type: array
                   preserveRadosNamespaceDataOnDelete:
                     type: boolean
-                required:
-                - dataPoolName
-                - metadataPoolName
                 type: object
               zone:
                 nullable: true

diff --git a/build/csv/ceph/ceph.rook.io_cephobjectzones.yaml b/build/csv/ceph/ceph.rook.io_cephobjectzones.yaml
@@ -314,11 +314,44 @@ spec:
                     x-kubernetes-validations:
                     - message: object store shared metadata pool is immutable
                       rule: self == oldSelf
+                  poolPlacements:
+                    items:
+                      properties:
+                        dataNonECPoolName:
+                          type: string
+                        dataPoolName:
+                          minLength: 1
+                          type: string
+                        metadataPoolName:
+                          minLength: 1
+                          type: string
+                        name:
+                          minLength: 1
+                          pattern: ^[a-zA-Z0-9._/-]+$
+                          type: string
+                        storageClasses:
+                          items:
+                            properties:
+                              dataPoolName:
+                                minLength: 1
+                                type: string
+                              name:
+                                minLength: 1
+                                pattern: ^[a-zA-Z0-9._/-]+$
+                                type: string
+                            required:
+                            - dataPoolName
+                            - name
+                            type: object
+                          type: array
+                      required:
+                      - dataPoolName
+                      - metadataPoolName
+                      - name
+                      type: object
+                    type: array
                   preserveRadosNamespaceDataOnDelete:
                     type: boolean
-                required:
-                - dataPoolName
-                - metadataPoolName
                 type: object
               zoneGroup:
                 type: string