From 6386ec9861a8f3c291374e0244311e4641b5f034 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Wed, 29 Mar 2017 12:13:33 -0700 Subject: [PATCH] simplify storage pool example --- Documentation/kubernetes.md | 9 ++------- demo/kubernetes/rook-operator-with-repo.yaml | 21 -------------------- demo/kubernetes/rook-operator.yaml | 2 ++ demo/kubernetes/rook-storageclass.yaml | 15 ++++++++++++++ 4 files changed, 19 insertions(+), 28 deletions(-) delete mode 100644 demo/kubernetes/rook-operator-with-repo.yaml diff --git a/Documentation/kubernetes.md b/Documentation/kubernetes.md index e85228a88..f555ad4b2 100644 --- a/Documentation/kubernetes.md +++ b/Documentation/kubernetes.md @@ -47,14 +47,9 @@ rook-api-1709486253-gvdnc 1/1 Running 0 1m ``` ### Provision Storage -Before Rook can start provisioning storage, a StorageClass and its storage pool need to be created. This is needed for Kubernetes to interoperate with Rook for provisioning persistent volumes. +Before Rook can start provisioning storage, a StorageClass and its storage pool need to be created. This is needed for Kubernetes to interoperate with Rook for provisioning persistent volumes. The rook-storageclass.yaml sample will create the storage pool automatically. For more options on pools, see the documentation on [creating storage pools](pool-tpr.md). -First create the storage pool. See the documentation on [creating storage pools](pool-tpr.md). -``` -kubectl create -f rook-pool.yaml -``` - -Rook already creates a default admin and rbd user, whose secrets are already specified in the sample [rook-storageclass.yaml](/demo/kubernetes/rook-storageclass.yaml). Now we just need to specify the Ceph monitor endpoints (requires `jq`): +Rook already creates a default admin and rbd user, whose secrets are specified in the sample [rook-storageclass.yaml](/demo/kubernetes/rook-storageclass.yaml). Now we just need to specify the Ceph monitor endpoints (requires `jq`): ``` export MONS=$(kubectl -n rook get pod mon0 mon1 mon2 -o json|jq ".items[].status.podIP"|tr -d "\""|sed -e 's/$/:6790/'|paste -s -d, -) diff --git a/demo/kubernetes/rook-operator-with-repo.yaml b/demo/kubernetes/rook-operator-with-repo.yaml deleted file mode 100644 index 786bb4f76..000000000 --- a/demo/kubernetes/rook-operator-with-repo.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: rook-operator -spec: - replicas: 1 - template: - metadata: - labels: - name: rook-operator - spec: - containers: - - name: rook-operator - image: quay.io/myrepo/rook-operator:mytag - env: - - name: ROOK_OPERATOR_REPO_PREFIX - value: quay.io/myrepo - - name: ROOK_OPERATOR_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace diff --git a/demo/kubernetes/rook-operator.yaml b/demo/kubernetes/rook-operator.yaml index 4a7d8b674..d3853bad5 100644 --- a/demo/kubernetes/rook-operator.yaml +++ b/demo/kubernetes/rook-operator.yaml @@ -17,3 +17,5 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + - name: ROOK_OPERATOR_REPO_PREFIX + value: quay.io/rook diff --git a/demo/kubernetes/rook-storageclass.yaml b/demo/kubernetes/rook-storageclass.yaml index 9f697db06..7db82c994 100644 --- a/demo/kubernetes/rook-storageclass.yaml +++ b/demo/kubernetes/rook-storageclass.yaml @@ -1,3 +1,18 @@ +apiVersion: rook.io/v1beta1 +kind: Rookpool +metadata: + name: rook-replicapool +spec: + name: replicapool + namespace: rook + replication: + count: 1 + # For an erasure-coded pool, comment out the replication count above and uncomment the following settings. + # Make sure you have enough OSDs to support the replica count or erasure code chunks. + #erasureCode: + # codingChunks: 2 + # dataChunks: 2 +--- apiVersion: storage.k8s.io/v1beta1 kind: StorageClass metadata: