Update for helm charts cephfs-canary

ceph · Sep 3, 2024 · 6449fbe · 6449fbe
1 parent dff4a1d
commit 6449fbe
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 125 deletions.
diff --git a/docs/cephfs/ceph-csi-cephfs-3-canary.tgz b/docs/cephfs/ceph-csi-cephfs-3-canary.tgz
diff --git a/docs/cephfs/ceph-csi-cephfs/Chart.yaml b/docs/cephfs/ceph-csi-cephfs/Chart.yaml
@@ -1,15 +1,15 @@
 ---
 apiVersion: v1
-appVersion: 3.12-canary
+appVersion: canary
 description: "Container Storage Interface (CSI) driver,
 provisioner, snapshotter and resizer for Ceph cephfs"
 name: ceph-csi-cephfs
-version: 3.12-canary
+version: 3-canary
 keywords:
   - ceph
   - cephfs
   - ceph-csi
 home: https://github.com/ceph/ceph-csi
 sources:
-  - https://github.com/ceph/ceph-csi/tree/release-v3.12/charts/ceph-csi-cephfs
-icon: https://raw.githubusercontent.com/ceph/ceph-csi/release-v3.12/assets/ceph-logo.png
+  - https://github.com/ceph/ceph-csi/tree/devel/charts/ceph-csi-cephfs
+icon: https://raw.githubusercontent.com/ceph/ceph-csi/devel/assets/ceph-logo.png
diff --git a/docs/cephfs/ceph-csi-cephfs/README.md b/docs/cephfs/ceph-csi-cephfs/README.md
@@ -194,7 +194,9 @@ charts and their default values.
 | `secret.create`                                | Specifies whether the secret should be created                                                                                                       | `false`                                            |
 | `secret.name`                                  | Specifies the cephFS secret name                                                                                                                     | `csi-cephfs-secret`                                |
 | `secret.adminID`                               | Specifies the admin ID of the cephFS secret                                                                                                          | `<plaintext ID>`                                   |
-| `secret.adminKey`                              | Specifies the key that corresponds to the adminID                                                                                                    | `<Ceph auth key corresponding to ID above>`        |
+| `secret.adminKey`                              | Specifies the key that corresponds to the adminID                                                                                                    | `""`                                               |
+| `secret.userID`                                | Specifies the user ID of the cephFS secret. Optional, used for static provisioned PVC.                                                               | `""`                                               |
+| `secret.userKey`                               | Specifies the key that corresponds to the userID. Optional, used for static  provisioned PVC.                                                        | `<Ceph auth key corresponding to ID above>`        |
 | `selinuxMount`                                | Mount the host /etc/selinux inside pods to support selinux-enabled filesystems                                                                                                      | `true`                                            |
 | `CSIDriver.fsGroupPolicy` | Specifies the fsGroupPolicy for the CSI driver object | `File` |
 | `CSIDriver.seLinuxMount` | Specify for efficient SELinux volume relabeling | `true` |

diff --git a/docs/cephfs/ceph-csi-cephfs/templates/secret.yaml b/docs/cephfs/ceph-csi-cephfs/templates/secret.yaml
@@ -14,6 +14,12 @@ metadata:
     heritage: {{ .Release.Service }}
     {{- with .Values.commonLabels }}{{ toYaml . | trim | nindent 4 }}{{- end }}
 stringData:
+  {{- if .Values.secret.userID }}
+  userID: {{ .Values.secret.userID }}
+  {{- end }}
+  {{- if .Values.secret.userKey }}
+  userKey: {{ .Values.secret.userKey }}
+  {{- end }}
   adminID: {{ .Values.secret.adminID }}
   adminKey: {{ .Values.secret.adminKey }}
 {{- end -}}
diff --git a/docs/cephfs/ceph-csi-cephfs/values.yaml b/docs/cephfs/ceph-csi-cephfs/values.yaml
@@ -117,7 +117,7 @@ nodeplugin:
   plugin:
     image:
       repository: quay.io/cephcsi/cephcsi
-      tag: v3.12-canary
+      tag: canary
       pullPolicy: IfNotPresent
     resources: {}
 
@@ -331,6 +331,9 @@ secret:
   # specified in the storage class
   adminID: <plaintext ID>
   adminKey: <Ceph auth key corresponding to ID above>
+  # User credentials are required for the static provisioned PVC.
+  userID: ""
+  userKey: ""
 
 # This is a sample configmap that helps define a Ceph configuration as required
 # by the CSI plugins.