Merge pull request #16043 from subhamkrai/csi-op-helm-support

helm: add helm support for new ceph-csi-operator

deploy/charts/rook-ceph/Chart.yaml

@@ -7,6 +7,11 @@ icon: https://rook.io/images/rook-logo.svg
 sources:
   - https://github.com/rook/rook
 dependencies:
-- name: library
-  version: "0.0.1"
-  repository: "file://../library"
+  - name: library
+    version: "0.0.1"
+    repository: "file://../library"
+  - name: ceph-csi-operator
+    version: 0.4.0
+    repository: https://ceph.github.io/ceph-csi-operator
+    alias: ceph-csi-operator
+    condition: csi.rookUseCsiOperator

deploy/charts/rook-ceph/templates/NOTES.txt

@@ -1,5 +1,4 @@
-The Rook Operator has been installed. Check its status by running:
-  kubectl --namespace {{ .Release.Namespace }} get pods -l "app=rook-ceph-operator"
+The Rook Operator has been installed.
 
 Visit https://rook.io/docs/rook/latest for instructions on how to create and configure Rook clusters
 
@@ -9,3 +8,6 @@ Important Notes:
 - The sample manifests assume you also installed the rook-ceph operator in the `rook-ceph` namespace.
 - The helm chart includes all the RBAC required to create a CephCluster CRD in the same namespace.
 - Any disk devices you add to the cluster in the 'CephCluster' must be empty (no filesystem and no partitions).
+{{- if .Values.csi.rookUseCsiOperator }}
+- The CSI operator will manage the CSI driver lifecycle for RBD, CephFS, and NFS drivers.
+{{- end }}

deploy/charts/rook-ceph/templates/configmap.yaml

@@ -31,6 +31,7 @@ data:
 {{- end }}
 
 {{- if .Values.csi }}
+  ROOK_USE_CSI_OPERATOR: {{ .Values.csi.rookUseCsiOperator | quote }}
   ROOK_CSI_ENABLE_RBD: {{ .Values.csi.enableRbdDriver | quote }}
   ROOK_CSI_ENABLE_CEPHFS: {{ .Values.csi.enableCephfsDriver | quote }}
   ROOK_CSI_DISABLE_DRIVER: {{ .Values.csi.disableCsiDriver | quote }}

deploy/charts/rook-ceph/values.yaml

@@ -77,9 +77,18 @@ containerSecurityContext:
 # -- If true, loop devices are allowed to be used for osds in test clusters
 allowLoopDevices: false
 
+ceph-csi-operator:
+  nameOverride: ceph-csi
+  fullnameOverride: ceph-csi
+  controllerManager:
+    manager:
+      env:
+        csiServiceAccountPrefix: "ceph-csi-"
+
 # Settings for whether to disable the drivers or other daemons if they are not
 # needed
 csi:
+  rookUseCsiOperator: false
   # -- Enable Ceph CSI RBD driver
   enableRbdDriver: true
   # -- Enable Ceph CSI CephFS driver