Update for helm charts cephfs-canary

Author: ceph-csi-bot

docs/cephfs/ceph-csi-cephfs-3-canary.tgz

@@ -1,15 +1,15 @@
 ---
 apiVersion: v1
-appVersion: 3.13-canary
+appVersion: canary
 description: "Container Storage Interface (CSI) driver,
 provisioner, snapshotter and resizer for Ceph cephfs"
 name: ceph-csi-cephfs
-version: 3.13-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.13/charts/ceph-csi-cephfs
-icon: https://raw.githubusercontent.com/ceph/ceph-csi/release-v3.13/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

docs/cephfs/ceph-csi-cephfs/Chart.yaml

@@ -232,10 +232,8 @@ charts and their default values.
 | `storageClass.mountOptions`                    | Specifies the mount options                                                                                                                          | `[]`                                               |
 | `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                                                                                                    | `""`                                               |
-| `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>`        |
+| `secret.userID`                                | Specifies the user ID of the cephFS secret.                                                                                                          | `""`                                               |
+| `secret.userKey`                               | Specifies the key that corresponds to the userID.                                                                                                    | `<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` |

docs/cephfs/ceph-csi-cephfs/README.md

@@ -14,12 +14,6 @@ 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 -}}

docs/cephfs/ceph-csi-cephfs/templates/secret.yaml

@@ -138,7 +138,7 @@ nodeplugin:
   plugin:
     image:
       repository: quay.io/cephcsi/cephcsi
-      tag: v3.13-canary
+      tag: canary
       pullPolicy: IfNotPresent
     resources: {}
 
@@ -383,11 +383,8 @@ secret:
   # Key values correspond to a user name and its key, as defined in the
   # ceph cluster. User ID should have required access to the 'pool'
   # 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: ""
+  userID: <plaintext ID>
+  userKey: <Ceph auth key corresponding to the userID above>
 
 # This is a sample configmap that helps define a Ceph configuration as required
 # by the CSI plugins.