From 362086d16cf473ceaabc436380d3759f4ac85deb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Wed, 13 May 2020 15:09:51 +0200
Subject: [PATCH] script: add 2 new SC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Clarify the helper for the run-as-user argument
* Add 2 new storage class and put the data so we stick with the same
pattern as the Secret and ConfigMap

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 .../ceph/create-external-cluster-resources.py | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/cluster/examples/kubernetes/ceph/create-external-cluster-resources.py b/cluster/examples/kubernetes/ceph/create-external-cluster-resources.py
index 83a821eb5..60e2f10c1 100644
--- a/cluster/examples/kubernetes/ceph/create-external-cluster-resources.py
+++ b/cluster/examples/kubernetes/ceph/create-external-cluster-resources.py
@@ -57,7 +57,7 @@ class RadosJSON:
         argP.add_argument("--ceph-conf", "-c",
                           help="Provide a ceph conf file.", type=str)
         argP.add_argument("--run-as-user", "-u",
-                          help="Provides a user name to check the cluster's health status",
+                          help="Provides a user name to check the cluster's health status, must be prefixed by 'client.'",
                           default=cls.EXTERNAL_USER_NAME, type=str)
         argP.add_argument("--format", "-t", choices=["json", "bash"],
                           default='json', help="Provides the output format (json | bash)")
@@ -380,7 +380,6 @@ class RadosJSON:
                     "userID": 'csi-rbd-provisioner',
                     "userKey": self.out_map['CSI_RBD_PROVISIONER_SECRET']
                 },
-                "pool-name": self.out_map['RBD_POOL_NAME']
             },
             {
                 "name": "rook-csi-cephfs-node",
@@ -397,11 +396,24 @@ class RadosJSON:
                     "adminID": 'csi-cephfs-provisioner',
                     "adminKey": self.out_map['CSI_CEPHFS_PROVISIONER_SECRET']
                 },
-                "filesystem-name": self.out_map['CEPHFS_FS_NAME'],
-                "pool-name": self.out_map['CEPHFS_POOL_NAME']
             },
             {
-                "name": "rook-ceph-retain-bucket",
+                "name": "ceph-rbd",
+                "kind": "StorageClass",
+                "data": {
+                    "pool": self.out_map['RBD_POOL_NAME']
+                }
+            },
+            {
+                "name": "cephfs",
+                "kind": "StorageClass",
+                "data": {
+                    "fsName": self.out_map['CEPHFS_FS_NAME'],
+                    "pool": self.out_map['CEPHFS_POOL_NAME']
+                }
+            },
+            {
+                "name": "ceph-rgw",
                 "kind": "StorageClass",
                 "data": {
                     "endpoint": self.out_map['RGW_ENDPOINT']