Merge pull request #1306 from kifeo/master

added rbd install instructions and ceph admin secret consistency
kubernetes-retired · Apr 22, 2020 · 5c38d73 · 5c38d73
2 parents 6d12fa0 + 06fe27a
commit 5c38d73
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ceph/rbd/README.md b/ceph/rbd/README.md
@@ -28,11 +28,15 @@ make push
 
 See https://kubernetes.io/.
 
+* Install the rbd package on the worker nodes (fixes #1256)
+
+for example, on debian the package is ceph-common
+
 * Create a Ceph admin secret
 
 ```bash
 ceph auth get client.admin 2>&1 |grep "key = " |awk '{print  $3'} |xargs echo -n > /tmp/key
-kubectl create secret generic ceph-admin-secret --from-file=/tmp/key --namespace=kube-system --type=kubernetes.io/rbd
+kubectl create secret generic ceph-secret-admin --from-file=/tmp/key --namespace=kube-system --type=kubernetes.io/rbd
 ```
 
 * Create a Ceph pool and a user secret

diff --git a/ceph/rbd/examples/class.yaml b/ceph/rbd/examples/class.yaml
@@ -8,7 +8,7 @@ parameters:
   pool: kube
   adminId: admin
   adminSecretNamespace: kube-system
-  adminSecretName: ceph-admin-secret
+  adminSecretName: ceph-secret-admin
   userId: kube
   userSecretNamespace: kube-system
   userSecretName: ceph-secret

diff --git a/ceph/rbd/examples/secrets.yaml b/ceph/rbd/examples/secrets.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: ceph-admin-secret
+  name: ceph-secret-admin
   namespace: kube-system
 type: "kubernetes.io/rbd"
 data: