From 429028dc54920e124187502e42a80c195f7bf1b5 Mon Sep 17 00:00:00 2001 From: Tolleiv Nietsch Date: Sat, 25 Jun 2016 13:04:54 +0200 Subject: [PATCH 1/3] Add some missing PVs and a capability overview --- docs/user-guide/persistent-volumes/index.md | 24 ++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/docs/user-guide/persistent-volumes/index.md b/docs/user-guide/persistent-volumes/index.md index ae465eea00..1c4bb150f5 100644 --- a/docs/user-guide/persistent-volumes/index.md +++ b/docs/user-guide/persistent-volumes/index.md @@ -51,10 +51,15 @@ The reclaim policy for a `PersistentVolume` tells the cluster what to do with th * GCEPersistentDisk * AWSElasticBlockStore +* AzureFile +* FC (Fibre Channel) * NFS * iSCSI * RBD (Ceph Block Device) +* CephFS +* Cinder (OpenStack block storage) * Glusterfs +* VsphereVolume * HostPath (single node testing only -- local storage is not supported in any way and WILL NOT WORK in a multi-node cluster) @@ -86,7 +91,7 @@ Currently, storage size is the only resource that can be set or requested. Futu ### Access Modes -A `PersistentVolume` can be mounted on a host in any way supported by the resource provider. Providers will have different capabilities and each PV's access modes are set to the specific modes supported by that particular volume. For example, NFS can support multiple read/write clients, but a specific NFS PV might be exported on the server as read-only. Each PV gets its own set of access modes describing that specific PV's capabilities. +A `PersistentVolume` can be mounted on a host in any way supported by the resource provider. As shown in the table below, providers will have different capabilities and each PV's access modes are set to the specific modes supported by that particular volume. For example, NFS can support multiple read/write clients, but a specific NFS PV might be exported on the server as read-only. Each PV gets its own set of access modes describing that specific PV's capabilities. The access modes are: @@ -103,6 +108,23 @@ In the CLI, the access modes are abbreviated to: > __Important!__ A volume can only be mounted using one access mode at a time, even if it supports many. For example, a GCEPersistentDisk can be mounted as ReadWriteOnce by a single node or ReadOnlyMany by many nodes, but not at the same time. +| | ReadWriteOnce| ReadOnlyMany| ReadWriteMany| +| :--- | :---: | :---: | :---: | +| AWSElasticBlockStore | x | - | - | +| AzureFile | x | x | x | +| CephFS | x | x | x | +| Cinder | x | - | - | +| FC | x | x | - | +| FlexVolume | x | x | - | +| GCEPersistentDisk | x | x | - | +| Glusterfs | x | x | x | +| HostPath | x | - | - | +| iSCSI | x | x | - | +| NFS | x | x | x | +| RDB | x | x | - | +| VsphereVolume | x | - | - | + + ### Recycling Policy Current recycling policies are: From ad83d18db4acb3c1f784839cf5230aa32002b27b Mon Sep 17 00:00:00 2001 From: Tolleiv Nietsch Date: Thu, 30 Jun 2016 12:32:40 +0200 Subject: [PATCH 2/3] Add header to the empty column --- docs/getting-started-guides/ubuntu.md | 4 ++-- docs/user-guide/persistent-volumes/index.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/getting-started-guides/ubuntu.md b/docs/getting-started-guides/ubuntu.md index c47a15dc9d..ac1abbf233 100644 --- a/docs/getting-started-guides/ubuntu.md +++ b/docs/getting-started-guides/ubuntu.md @@ -80,7 +80,7 @@ First configure the cluster information in cluster/ubuntu/config-default.sh, fol ```shell export nodes="vcap@10.10.103.250 vcap@10.10.103.162 vcap@10.10.103.223" -export role="ai i i" +export roles="ai i i" export NUM_NODES=${NUM_NODES:-3} @@ -92,7 +92,7 @@ export FLANNEL_NET=172.16.0.0/16 The first variable `nodes` defines all your cluster nodes, master node comes first and separated with blank space like ` ` -Then the `role` variable defines the role of above machine in the same order, "ai" stands for machine +Then the `roles` variable defines the role of above machine in the same order, "ai" stands for machine acts as both master and node, "a" stands for master, "i" stands for node. The `NUM_NODES` variable defines the total number of nodes. diff --git a/docs/user-guide/persistent-volumes/index.md b/docs/user-guide/persistent-volumes/index.md index 1c4bb150f5..27fb34f14f 100644 --- a/docs/user-guide/persistent-volumes/index.md +++ b/docs/user-guide/persistent-volumes/index.md @@ -108,7 +108,7 @@ In the CLI, the access modes are abbreviated to: > __Important!__ A volume can only be mounted using one access mode at a time, even if it supports many. For example, a GCEPersistentDisk can be mounted as ReadWriteOnce by a single node or ReadOnlyMany by many nodes, but not at the same time. -| | ReadWriteOnce| ReadOnlyMany| ReadWriteMany| +| Volume Plugin | ReadWriteOnce| ReadOnlyMany| ReadWriteMany| | :--- | :---: | :---: | :---: | | AWSElasticBlockStore | x | - | - | | AzureFile | x | x | x | From bca79cfdcbb121a6ca543b9cd1ca704d5ee87a11 Mon Sep 17 00:00:00 2001 From: Tolleiv Nietsch Date: Tue, 2 Aug 2016 16:44:04 +0200 Subject: [PATCH 3/3] Undo the changes within ubuntu.md --- docs/getting-started-guides/ubuntu.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting-started-guides/ubuntu.md b/docs/getting-started-guides/ubuntu.md index ac1abbf233..c47a15dc9d 100644 --- a/docs/getting-started-guides/ubuntu.md +++ b/docs/getting-started-guides/ubuntu.md @@ -80,7 +80,7 @@ First configure the cluster information in cluster/ubuntu/config-default.sh, fol ```shell export nodes="vcap@10.10.103.250 vcap@10.10.103.162 vcap@10.10.103.223" -export roles="ai i i" +export role="ai i i" export NUM_NODES=${NUM_NODES:-3} @@ -92,7 +92,7 @@ export FLANNEL_NET=172.16.0.0/16 The first variable `nodes` defines all your cluster nodes, master node comes first and separated with blank space like ` ` -Then the `roles` variable defines the role of above machine in the same order, "ai" stands for machine +Then the `role` variable defines the role of above machine in the same order, "ai" stands for machine acts as both master and node, "a" stands for master, "i" stands for node. The `NUM_NODES` variable defines the total number of nodes.