Merge branch 'master' of https://github.com/kubernetes/kubernetes.git…

…hub.io into release-1.7 * 'master' of https://github.com/kubernetes/kubernetes.github.io: Fix typo 'bash' -> 'brew' update pod persistent volume example storage class (#3979) Change Task titles to imperative: Admin. (#4033) Change Task titles to imperative: Daemons, GPUs. (#4032) Change Task titles to imperative: Federation. (#4031) Change Task titles to imperative: TLS. (#4030) Change Task titles to imperative: Access Extend. (#4029) Change Task titles to imperative: Monitor. (#4028) Change Task titles to imperative: Access Apps. (#4027) Change Task title to imperative: Run Job. (#4026) Change Task titles to imperative: Run Apps. (#4025) Change Task titles to imperative: Inject. (#4024) Change Task titles to imperative: Tools. (#4023) Change Task titles to imperative. (#4022) Fix typo in update-imported-docs.sh Add internal provisioner support matrix (#4009) # Conflicts: # docs/tasks/administer-cluster/declare-network-policy.md
kubernetes · Jun 19, 2017 · 628e88e · 628e88e
2 parents ccd2b46 + ce4fe04
commit 628e88e
Show file tree

Hide file tree

Showing 81 changed files with 185 additions and 156 deletions.
diff --git a/_data/tasks.yml b/_data/tasks.yml
@@ -3,13 +3,13 @@ abstract: "Step-by-step instructions for performing operations with Kubernetes."
 toc:
 - docs/tasks/index.md
 
-- title: Installing Tools
+- title: Install Tools
   section:
   - docs/tasks/tools/install-kubectl.md
   - docs/tasks/tools/install-minikube.md
   - docs/setup/independent/install-kubeadm.md
 
-- title: Configuring Pods and Containers
+- title: Configure Pods and Containers
   section:
   - docs/tasks/configure-pod-container/assign-cpu-ram-container.md
   - docs/tasks/configure-pod-container/configure-volume-storage.md
@@ -25,7 +25,7 @@ toc:
   - docs/tasks/configure-pod-container/configure-pod-configmap.md
   - docs/tools/kompose/user-guide.md
 
-- title: Injecting Data Into Applications
+- title: Inject Data Into Applications
   section:
   - docs/tasks/inject-data-application/define-command-argument-container.md
   - docs/tasks/inject-data-application/define-environment-variable-container.md
@@ -34,7 +34,7 @@ toc:
   - docs/tasks/inject-data-application/distribute-credentials-secure.md
   - docs/tasks/inject-data-application/podpreset.md
 
-- title: Running Applications
+- title: Run Applications
   section:
   - docs/tasks/run-application/run-stateless-application-deployment.md
   - docs/tasks/run-application/run-single-instance-stateful-application.md
@@ -47,13 +47,13 @@ toc:
   - docs/tasks/run-application/horizontal-pod-autoscale.md
   - docs/tasks/run-application/horizontal-pod-autoscale-walkthrough.md
 
-- title: Running Jobs
+- title: Run Jobs
   section:
   - docs/tasks/job/parallel-processing-expansion.md
   - docs/tasks/job/coarse-parallel-processing-work-queue/index.md
   - docs/tasks/job/fine-parallel-processing-work-queue/index.md
 
-- title: Accessing Applications in a Cluster
+- title: Access Applications in a Cluster
   section:
   - docs/tasks/access-application-cluster/web-ui-dashboard.md
   - docs/tasks/access-application-cluster/access-cluster.md
@@ -69,7 +69,7 @@ toc:
   - title: Configuring DNS for a Cluster
     path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/cluster-dns
 
-- title: Monitoring, Logging, and Debugging
+- title: Monitor, Log, and Debug
   section:
   - docs/tasks/debug-application-cluster/resource-usage-monitoring.md
   - docs/tasks/debug-application-cluster/get-shell-running-container.md
@@ -85,20 +85,20 @@ toc:
   - docs/tasks/debug-application-cluster/debug-stateful-set.md
   - docs/tasks/debug-application-cluster/debug-application-introspection.md
   - docs/tasks/debug-application-cluster/audit.md
-  - title: Using Explorer to Examine the Runtime Environment
+  - title: Use Explorer to Examine the Runtime Environment
     path: https://github.com/kubernetes/kubernetes/tree/release-1.5/examples/explorer
 
-- title: Accessing and Extending the Kubernetes API
+- title: Access and Extend the Kubernetes API
   section:
   - docs/tasks/access-kubernetes-api/http-proxy-access-api.md
   - docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions.md
   - docs/tasks/access-kubernetes-api/extend-api-third-party-resource.md
 
-- title: Using TLS
+- title: TLS
   section:
   - docs/tasks/tls/managing-tls-in-a-cluster.md
 
-- title: Administering a Cluster
+- title: Administer a Cluster
   section:
   - docs/tasks/administer-cluster/access-cluster-api.md
   - docs/tasks/administer-cluster/access-cluster-services.md
@@ -127,10 +127,10 @@ toc:
   - docs/tasks/administer-cluster/running-cloud-controller.md
   - docs/tasks/administer-cluster/highly-available-master.md
   - docs/tasks/administer-cluster/configure-multiple-schedulers.md
-  - title: Changing Cluster Size
+  - title: Change Cluster Size
     path: https://github.com/kubernetes/kubernetes/wiki/User-FAQ#how-do-i-change-the-size-of-my-cluster/
 
-- title: Federation - Running an App on Multiple Clusters
+- title: Federation - Run an App on Multiple Clusters
   section:
   - docs/tasks/federation/federation-service-discovery.md
   - docs/tasks/federation/set-up-cluster-federation-kubefed.md
@@ -145,11 +145,11 @@ toc:
   - docs/tasks/administer-federation/replicaset.md
   - docs/tasks/administer-federation/secret.md
 
-- title: Managing Cluster Daemons
+- title: Manage Cluster Daemons
   section:
   - docs/tasks/manage-daemon/update-daemon-set.md
 
-- title: Managing GPUs
+- title: Manage GPUs
   section:
   - docs/tasks/manage-gpus/scheduling-gpus.md
 

diff --git a/docs/concepts/storage/persistent-volumes.md b/docs/concepts/storage/persistent-volumes.md
@@ -411,6 +411,27 @@ parameters:
 Storage classes have a provisioner that determines what volume plugin is used
 for provisioning PVs. This field must be specified.
 
+| Volume Plugin        | Internal Provisioner| Config Example                       |
+| :---                 |     :---:           |    :---:                             |
+| AWSElasticBlockStore | &#x2713;            | [AWS](#aws)                          |
+| AzureFile            | &#x2713;            | -                                    |
+| AzureDisk            | &#x2713;            | [Azure Disk](#azure-disk)            |
+| CephFS               | -                   | -                                    |
+| Cinder               | &#x2713;            | [OpenStack Cinder](#openstack-cinder)|
+| FC                   | -                   | -                                    |
+| FlexVolume           | -                   | -                                    |
+| Flocker              | &#x2713;            | -                                    |
+| GCEPersistentDisk    | &#x2713;            | [GCE](#gce)                          |
+| Glusterfs            | &#x2713;            | [Glusterfs](#glusterfs)              |
+| iSCSI                | -                   | -                                    |
+| PhotonPersistentDisk | &#x2713;            | -                                    |
+| Quobyte              | &#x2713;            | [Quobyte](#quobyte)                  |
+| NFS                  | -                   | -                                    |
+| RBD                  | &#x2713;            | [Ceph RBD](#ceph-rbd)                |
+| VsphereVolume        | &#x2713;            | [vSphere](#vsphere)                  |
+| PortworxVolume       | &#x2713;            | [Portworx Volume](#portworx-volume)  |
+| ScaleIO              | &#x2713;            | [ScaleIO](#scaleio)                  |
+
 You are not restricted to specifying the "internal" provisioners
 listed here (whose names are prefixed with "kubernetes.io" and shipped
 alongside Kubernetes). You can also run and specify external provisioners,
@@ -421,6 +442,11 @@ run, what volume plugin it uses (including Flex), etc. The repository [kubernete
 houses a library for writing external provisioners that implements the bulk of
 the specification plus various community-maintained external provisioners.
 
+For example, NFS doesn't provide an internal provisioner, but an external provisioner
+can be used. Some external provisioners are listed under the repository [kubernetes-incubator/external-storage](https://github.com/kubernetes-incubator/external-storage).
+There are also cases when 3rd party storage vendors provide their own external
+provisioner.
+
 ### Parameters
 Storage classes have parameters that describe volumes belonging to the storage
 class. Different parameters may be accepted depending on the `provisioner`. For

diff --git a/docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig.md b/docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig.md
@@ -2,7 +2,7 @@
 assignees:
 - mikedanese
 - thockin
-title: Authenticating Across Clusters with kubeconfig
+title: Authenticate Across Clusters with kubeconfig
 redirect_from:
 - "/docs/user-guide/kubeconfig-file/"
 - "/docs/user-guide/kubeconfig-file.html"

diff --git a/...sks/access-application-cluster/communicate-containers-same-pod-shared-volume.md b/...sks/access-application-cluster/communicate-containers-same-pod-shared-volume.md
@@ -1,5 +1,5 @@
 ---
-title: Communicating Between Containers in the Same Pod Using a Shared Volume
+title: Communicate Between Containers in the Same Pod Using a Shared Volume
 redirect_from:
 - "/docs/user-guide/pods/multi-container/"
 - "/docs/user-guide/pods/multi-container.html"

diff --git a/docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md b/docs/tasks/access-application-cluster/configure-cloud-provider-firewall.md
@@ -2,7 +2,7 @@
 assignees:
 - bprashanth
 - davidopp
-title: Configuring Your Cloud Provider's Firewalls
+title: Configure Your Cloud Provider's Firewalls
 redirect_from:
 - "/docs/user-guide/services-firewalls/"
 - "/docs/user-guide/services-firewalls.html"

diff --git a/docs/tasks/access-application-cluster/connecting-frontend-backend.md b/docs/tasks/access-application-cluster/connecting-frontend-backend.md
@@ -1,5 +1,5 @@
 ---
-title: Connecting a Front End to a Back End Using a Service
+title: Connect a Front End to a Back End Using a Service
 redirect_from:
 - "/docs/user-guide/services/operations/"
 - "/docs/user-guide/services/operations.html"

diff --git a/docs/tasks/access-application-cluster/create-external-load-balancer.md b/docs/tasks/access-application-cluster/create-external-load-balancer.md
@@ -1,5 +1,5 @@
 ---
-title: Creating an External Load Balancer
+title: Create an External Load Balancer
 redirect_from:
 - "/docs/user-guide/load-balancer/"
 - "/docs/user-guide/load-balancer.html"
@@ -163,4 +163,4 @@ Internal pod to pod traffic should behave similar to ClusterIP services, with eq
 
 {% endcapture %}
 
-{% include templates/task.md %}
+{% include templates/task.md %}
diff --git a/docs/tasks/access-application-cluster/list-all-running-container-images.md b/docs/tasks/access-application-cluster/list-all-running-container-images.md
@@ -1,5 +1,5 @@
 ---
-title: Listing All Container Images Running in a Cluster
+title: List All Container Images Running in a Cluster
 redirect_from:
 - "/docs/tasks/kubectl/list-all-running-container-images/"
 - "/docs/tasks/kubectl/list-all-running-container-images.html"

diff --git a/docs/tasks/access-application-cluster/load-balance-access-application-cluster.md b/docs/tasks/access-application-cluster/load-balance-access-application-cluster.md
@@ -1,5 +1,5 @@
 ---
-title: Providing Load-Balanced Access to an Application in a Cluster
+title: Provide Load-Balanced Access to an Application in a Cluster
 ---
 
 {% capture overview %}

diff --git a/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md b/docs/tasks/access-application-cluster/port-forward-access-application-cluster.md
@@ -1,5 +1,5 @@
 ---
-title: Using Port Forwarding to Access Applications in a Cluster
+title: Use Port Forwarding to Access Applications in a Cluster
 redirect_from:
 - "/docs/user-guide/connecting-to-applications-port-forward/"
 - "/docs/user-guide/connecting-to-applications-port-forward.html"

diff --git a/docs/tasks/access-application-cluster/service-access-application-cluster.md b/docs/tasks/access-application-cluster/service-access-application-cluster.md
@@ -1,5 +1,5 @@
 ---
-title: Using a Service to Access an Application in a Cluster
+title: Use a Service to Access an Application in a Cluster
 redirect_from:
 - "/docs/user-guide/quick-start/"
 - "/docs/user-guide/quick-start.html"

diff --git a/docs/tasks/access-kubernetes-api/extend-api-third-party-resource.md b/docs/tasks/access-kubernetes-api/extend-api-third-party-resource.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - IanLewis
-title: Extending the Kubernetes API Using Third Party Resources
+title: Extend the Kubernetes API Using Third Party Resources
 redirect_from:
 - "/docs/user-guide/thirdpartyresources/"
 - "/docs/user-guide/thirdpartyresources.html"

diff --git a/docs/tasks/access-kubernetes-api/http-proxy-access-api.md b/docs/tasks/access-kubernetes-api/http-proxy-access-api.md
@@ -1,5 +1,5 @@
 ---
-title: Using an HTTP Proxy to Access the Kubernetes API
+title: Use an HTTP Proxy to Access the Kubernetes API
 redirect_from:
 - "/docs/user-guide/connecting-to-applications-proxy/"
 - "/docs/user-guide/connecting-to-applications-proxy.html"

diff --git a/docs/tasks/administer-cluster/access-cluster-api.md b/docs/tasks/administer-cluster/access-cluster-api.md
@@ -1,5 +1,5 @@
 ---
-title: Accessing Clusters Using the Kubernetes API
+title: Access Clusters Using the Kubernetes API
 redirect_from:
 - "/docs/user-guide/accessing-the-cluster/"
 - "/docs/user-guide/accessing-the-cluster.html"

diff --git a/docs/tasks/administer-cluster/access-cluster-services.md b/docs/tasks/administer-cluster/access-cluster-services.md
@@ -1,5 +1,5 @@
 ---
-title: Accessing Services Running on Clusters
+title: Access Services Running on Clusters
 redirect_from:
 - "/docs/user-guide/accessing-the-cluster/"
 - "/docs/user-guide/accessing-the-cluster.html"
@@ -112,4 +112,4 @@ You may be able to put an apiserver proxy url into the address bar of a browser.
 
 {% endcapture %}
 
-{% include templates/task.md %}
+{% include templates/task.md %}
diff --git a/docs/tasks/administer-cluster/apply-resource-quota-limit.md b/docs/tasks/administer-cluster/apply-resource-quota-limit.md
@@ -2,7 +2,7 @@
 assignees:
 - derekwaynecarr
 - janetkuo
-title: Applying Resource Quotas and Limits
+title: Apply Resource Quotas and Limits
 redirect_from:
 - "/docs/admin/resourcequota/walkthrough/"
 - "/docs/admin/resourcequota/walkthrough.html"

diff --git a/docs/tasks/administer-cluster/calico-network-policy.md b/docs/tasks/administer-cluster/calico-network-policy.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - caseydavenport
-title: Using Calico for NetworkPolicy
+title: Use Calico for NetworkPolicy
 redirect_from:
 - "/docs/getting-started-guides/network-policy/calico/"
 - "/docs/getting-started-guides/network-policy/calico.html"

diff --git a/docs/tasks/administer-cluster/change-default-storage-class.md b/docs/tasks/administer-cluster/change-default-storage-class.md
@@ -1,5 +1,5 @@
 ---
-title: Changing the default StorageClass
+title: Change the default StorageClass
 ---
 
 {% capture overview %}

diff --git a/docs/tasks/administer-cluster/change-pv-reclaim-policy.md b/docs/tasks/administer-cluster/change-pv-reclaim-policy.md
@@ -1,5 +1,5 @@
 ---
-title: Changing the Reclaim Policy of a PersistentVolume
+title: Change the Reclaim Policy of a PersistentVolume
 ---
 
 {% capture overview %}

diff --git a/docs/tasks/administer-cluster/configure-multiple-schedulers.md b/docs/tasks/administer-cluster/configure-multiple-schedulers.md
@@ -2,7 +2,7 @@
 assignees:
 - davidopp
 - madhusudancs
-title: Configuring Multiple Schedulers
+title: Configure Multiple Schedulers
 redirect_from:
 - "/docs/admin/multiple-schedulers/"
 - "/docs/admin/multiple-schedulers.html"

diff --git a/docs/tasks/administer-cluster/configure-pod-disruption-budget.md b/docs/tasks/administer-cluster/configure-pod-disruption-budget.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - davidopp
-title: Configuring a Pod Disruption Budget
+title: Configure a Pod Disruption Budget
 redirect_from:
 - "/docs/admin/disruptions/"
 - "/docs/admin/disruptions.html"

diff --git a/docs/tasks/administer-cluster/configure-upgrade-etcd.md b/docs/tasks/administer-cluster/configure-upgrade-etcd.md
@@ -2,7 +2,7 @@
 assignees:
 - mml
 - wojtek-t
-title: Configuring, Upgrading, and Rolling Back etcd
+title: Configure, Upgrade, and Roll Back etcd
 redirect_from:
 - "/docs/concepts/storage/etcd-store-api-object/"
 - "/docs/concepts/storage/etcd-store-api-object.html"

diff --git a/docs/tasks/administer-cluster/cpu-memory-limit.md b/docs/tasks/administer-cluster/cpu-memory-limit.md
@@ -2,7 +2,7 @@
 assignees:
 - derekwaynecarr
 - janetkuo
-title: Setting Pod CPU and Memory Limits
+title: Set Pod CPU and Memory Limits
 redirect_from:
 - "/docs/admin/limitrange/"
 - "/docs/admin/limitrange/index.html"

diff --git a/docs/tasks/administer-cluster/declare-network-policy.md b/docs/tasks/administer-cluster/declare-network-policy.md
@@ -2,7 +2,7 @@
 assignees:
 - caseydavenport
 - danwinship
-title: Declaring Network Policy
+title: Declare Network Policy
 redirect_from:
 - "/docs/getting-started-guides/network-policy/walkthrough/"
 - "/docs/getting-started-guides/network-policy/walkthrough.html"

diff --git a/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md b/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md
@@ -1,5 +1,5 @@
 ---
-title: Autoscaling the DNS Service in a Cluster
+title: Autoscale the DNS Service in a Cluster
 ---
 
 {% capture overview %}

diff --git a/docs/tasks/administer-cluster/highly-available-master.md b/docs/tasks/administer-cluster/highly-available-master.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - jszczepkowski
-title: Setting up High-Availability Kubernetes Masters
+title: Set up High-Availability Kubernetes Masters
 redirect_from:
 - "/docs/admin/ha-master-gce/"
 - "/docs/admin/ha-master-gce.html"

diff --git a/docs/tasks/administer-cluster/limit-storage-consumption.md b/docs/tasks/administer-cluster/limit-storage-consumption.md
@@ -1,5 +1,5 @@
 ---
-title: Limiting Storage Consumption
+title: Limit Storage Consumption
 redirect_from:
 - "/docs/admin/resourcequota/limitstorageconsumption/"
 - "/docs/admin/resourcequota/limitstorageconsumption.html"

diff --git a/docs/tasks/administer-cluster/namespaces.md b/docs/tasks/administer-cluster/namespaces.md
@@ -2,7 +2,7 @@
 assignees:
 - derekwaynecarr
 - janetkuo
-title: Sharing a Cluster with Namespaces
+title: Share a Cluster with Namespaces
 redirect_from:
 - "/docs/admin/namespaces/"
 - "/docs/admin/namespaces/index.html"

diff --git a/docs/tasks/administer-cluster/out-of-resource.md b/docs/tasks/administer-cluster/out-of-resource.md
@@ -3,7 +3,7 @@ assignees:
 - derekwaynecarr
 - vishh
 - timstclair
-title: Configuring Out Of Resource Handling
+title: Configure Out Of Resource Handling
 redirect_from:
 - "/docs/admin/out-of-resource/"
 - "/docs/admin/out-of-resource.html"

diff --git a/docs/tasks/administer-cluster/reserve-compute-resources.md b/docs/tasks/administer-cluster/reserve-compute-resources.md
@@ -3,7 +3,7 @@ assignees:
 - vishh
 - derekwaynecarr
 - dashpole
-title: Reserving Compute Resources for System Daemons
+title: Reserve Compute Resources for System Daemons
 redirect_from:
 - "/docs/admin/node-allocatable/"
 - "/docs/admin/node-allocatable.html"

diff --git a/docs/tasks/administer-cluster/romana-network-policy.md b/docs/tasks/administer-cluster/romana-network-policy.md
@@ -1,7 +1,7 @@
 ---
 assignees:
 - chrismarino
-title: Using Romana for NetworkPolicy
+title: Romana for NetworkPolicy
 redirect_from:
 - "/docs/getting-started-guides/network-policy/romana/"
 - "/docs/getting-started-guides/network-policy/romana.html"