Merge pull request #16069 from zmerlynn/nfs-1.1

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-28 22:39:09 -07:00
17 changed files with 217 additions and 219 deletions

View File

@@ -291,15 +291,6 @@ before you can use it__
See the [NFS example](../../examples/nfs/) for more details.
For example, [this file](../../examples/nfs/nfs-web-pod.yaml) demonstrates how to
specify the usage of an NFS volume within a pod.
In this example one can see that a `volumeMount` called `nfs` is being mounted
onto `/usr/share/nginx/html` in the container `web`. The volume "nfs" is defined as
type `nfs`, with the NFS server serving from `nfs-server.default.kube.local`
and exporting directory `/` as the share. The mount being created in this
example is writeable.
### iscsi
An `iscsi` volume allows an existing iSCSI (SCSI over IP) volume to be mounted