From b6628fa061d2edbe2dcb30a3ce3d0e17dd311004 Mon Sep 17 00:00:00 2001
From: Elson Rodriguez <elson.rodriguez@gmail.com>
Date: Mon, 5 Dec 2016 11:26:01 -0800
Subject: [PATCH] Adding correct secret type for Ceph RBD storageclass
 provisioner example.

Also adding note on base64 encoding to secret files.
---
 .../experimental/persistent-volume-provisioning/README.md   | 6 +++---
 .../rbd/ceph-secret-admin.yaml                              | 1 +
 .../rbd/ceph-secret-user.yaml                               | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/experimental/persistent-volume-provisioning/README.md b/examples/experimental/persistent-volume-provisioning/README.md
index 981068c46f7..0578613980a 100644
--- a/examples/experimental/persistent-volume-provisioning/README.md
+++ b/examples/experimental/persistent-volume-provisioning/README.md
@@ -335,10 +335,10 @@ First we must identify the Ceph client admin key. This is usually found in `/etc
   caps osd = "allow *"
 ```
 
-From the key value, we will create a secret. We must create the Ceph admin Secret in the namespace defined in our `StorageClass`. In this example we set the namespace to `kube-system`.
+From the key value, we will create a secret. We must create the Ceph admin Secret in the namespace defined in our `StorageClass`. In this example we've set the namespace to `kube-system`.
 
 ```
-$ kubectl create secret generic ceph-secret-admin --from-literal=key='AQBfxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==' --namespace=kube-system
+$ kubectl create secret generic ceph-secret-admin --from-literal=key='AQBfxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx==' --namespace=kube-system --type=kubernetes.io/rbd
 ```
 
 Now modify `examples/experimental/persistent-volume-provisioning/rbd/rbd-storage-class.yaml` to reflect your environment, particularly the `monitors` field.  We are now ready to create our RBD Storage Class:
@@ -360,7 +360,7 @@ This key will be made into a secret, just like the admin secret. However this us
 
 ```
 kubectl create namespace myns
-kubectl create secret generic ceph-secret-user --from-literal=key='AQBQyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy==' --namespace=myns
+kubectl create secret generic ceph-secret-user --from-literal=key='AQBQyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy==' --namespace=myns --type=kubernetes.io/rbd
 ```
 
 You are now ready to provision and use RBD storage.
diff --git a/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml b/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml
index a11e5000b62..f86d975f7f7 100644
--- a/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml
+++ b/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml
@@ -4,5 +4,6 @@ metadata:
   name: ceph-secret-admin
 type: "kubernetes.io/rbd"
 data:
+#Please note this value is base64 encoded.
   key: QVFEQ1pMdFhPUnQrSmhBQUFYaERWNHJsZ3BsMmNjcDR6RFZST0E9PQ==
 type: kubernetes.io/rbd
diff --git a/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-user.yaml b/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-user.yaml
index 96b777646d5..e538dcafb5a 100644
--- a/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-user.yaml
+++ b/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-user.yaml
@@ -4,4 +4,5 @@ metadata:
   name: ceph-secret-user
 type: "kubernetes.io/rbd"  
 data:
+#Please note this value is base64 encoded.
   key: QVFBTWdYaFZ3QkNlRGhBQTlubFBhRnlmVVNhdEdENGRyRldEdlE9PQ==