From 18a95234b55551edda66f0c577998e36101eef47 Mon Sep 17 00:00:00 2001
From: Ceph Jenkins <ceph-jenkins@redhat.com>
Date: Sun, 11 Aug 2024 04:05:18 -0400
Subject: [PATCH] csv: add additional csv changes that other commits bring

add generated csv changes

Signed-off-by: Ceph Jenkins <ceph-jenkins@redhat.com>
---
 .../ceph/ceph.rook.io_cephobjectstores.yaml   | 53 +++++++++++++++++++
 ...k-ceph-operator.clusterserviceversion.yaml | 44 +++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/build/csv/ceph/ceph.rook.io_cephobjectstores.yaml b/build/csv/ceph/ceph.rook.io_cephobjectstores.yaml
index f65dff5a05ed..c2ff4ad69e02 100644
--- a/build/csv/ceph/ceph.rook.io_cephobjectstores.yaml
+++ b/build/csv/ceph/ceph.rook.io_cephobjectstores.yaml
@@ -43,6 +43,33 @@ spec:
                 items:
                   type: string
                 type: array
+              auth:
+                properties:
+                  keystone:
+                    nullable: true
+                    properties:
+                      acceptedRoles:
+                        items:
+                          type: string
+                        type: array
+                      implicitTenants:
+                        type: string
+                      revocationInterval:
+                        nullable: true
+                        type: integer
+                      serviceUserSecretName:
+                        type: string
+                      tokenCacheSize:
+                        nullable: true
+                        type: integer
+                      url:
+                        type: string
+                    required:
+                    - acceptedRoles
+                    - serviceUserSecretName
+                    - url
+                    type: object
+                type: object
               dataPool:
                 nullable: true
                 properties:
@@ -1116,6 +1143,32 @@ spec:
                 type: object
               preservePoolsOnDelete:
                 type: boolean
+              protocols:
+                properties:
+                  s3:
+                    nullable: true
+                    properties:
+                      authUseKeystone:
+                        nullable: true
+                        type: boolean
+                      enabled:
+                        nullable: true
+                        type: boolean
+                    type: object
+                  swift:
+                    nullable: true
+                    properties:
+                      accountInUrl:
+                        nullable: true
+                        type: boolean
+                      urlPrefix:
+                        nullable: true
+                        type: string
+                      versioningEnabled:
+                        nullable: true
+                        type: boolean
+                    type: object
+                type: object
               security:
                 nullable: true
                 properties:
diff --git a/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml b/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml
index 5fb3f5aa9481..1587ffb25760 100644
--- a/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml
+++ b/build/csv/ceph/rook-ceph-operator.clusterserviceversion.yaml
@@ -2397,6 +2397,50 @@ spec:
                 - customresourcedefinitions
               verbs:
                 - get
+            - apiGroups:
+                - csi.ceph.io
+              resources:
+                - cephconnections
+              verbs:
+                - create
+                - delete
+                - get
+                - list
+                - update
+                - watch
+            - apiGroups:
+                - csi.ceph.io
+              resources:
+                - clientprofiles
+              verbs:
+                - create
+                - delete
+                - get
+                - list
+                - update
+                - watch
+            - apiGroups:
+                - csi.ceph.io
+              resources:
+                - operatorconfigs
+              verbs:
+                - create
+                - delete
+                - get
+                - list
+                - update
+                - watch
+            - apiGroups:
+                - csi.ceph.io
+              resources:
+                - drivers
+              verbs:
+                - create
+                - delete
+                - get
+                - list
+                - update
+                - watch
           serviceAccountName: rook-ceph-system
         - rules:
             - apiGroups: