From 9bbabc2f5db40213ea59ffd614391cc3dfae5801 Mon Sep 17 00:00:00 2001
From: gman <robert.vasek@cern.ch>
Date: Fri, 13 Apr 2018 15:25:13 +0200
Subject: [PATCH] cephfs/deploy: updates storage class, secrets

---
 .../kubernetes/cephfs-storage-class.yaml      | 22 ++++++++++++++-----
 deploy/cephfs/kubernetes/secret.yaml          |  8 ++++++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/deploy/cephfs/kubernetes/cephfs-storage-class.yaml b/deploy/cephfs/kubernetes/cephfs-storage-class.yaml
index 26f3a2345..9d704d5f9 100644
--- a/deploy/cephfs/kubernetes/cephfs-storage-class.yaml
+++ b/deploy/cephfs/kubernetes/cephfs-storage-class.yaml
@@ -4,13 +4,25 @@ metadata:
   name: csi-cephfs
 provisioner: csi-cephfsplugin
 parameters:
-  # The driver can use either ceph-fuse (fuse) or ceph kernel client (kernel)
-  mounter: fuse
-
   monitors: mon1:port,mon2:port
-  rootPath: /
-  user: admin
 
+  # If set to true, a new volume will be created along with a RADOS user - this requires admin access.
+  # If set to false, it is assumed the volume already exists and the user is expected to provide
+  # a rootPath to a cephfs volume and user credentials.
+  provisionVolume: "true"
+
+  # Required if provisionVolume is set to false
+  # rootPath: /path-in-cephfs
+
+  # Required if provisionVolume is set to true
+  # pool: cephfs_data
+
+  # The secret has to contain user and/or admin credentials.
   csiProvisionerSecretName: csi-cephfs-secret
   csiProvisionerSecretNameSpace: default
+
+  # (optional) The driver can use either ceph-fuse (fuse) or ceph kernel client (kernel)
+  # If left out, default volume mounter will be used - this is determined by probing for ceph-fuse
+  # or by setting the default mounter explicitly via --volumemounter command-line argument.
+  # mounter: kernel
 reclaimPolicy: Delete
diff --git a/deploy/cephfs/kubernetes/secret.yaml b/deploy/cephfs/kubernetes/secret.yaml
index e344e75a8..61038ba31 100644
--- a/deploy/cephfs/kubernetes/secret.yaml
+++ b/deploy/cephfs/kubernetes/secret.yaml
@@ -4,4 +4,10 @@ metadata:
   name: csi-cephfs-secret
   namespace: default
 data:
-  key: your-password-encoded-by-base64
\ No newline at end of file
+  # Required if provisionVolume is set to false
+  userID: userID-encoded-by-base64
+  userKey: userKey-encoded-by-base64
+
+  # Required if provisionVolume is set to true
+  adminID: adminID-encoded-by-base64
+  adminKey: adminKey-encoded-by-base64