whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.6

Browse Source 
* 'master' of https://github.com/kubernetes/kubernetes.github.io:
  rephrase the expression of configmap/index.md
  Do not link to org/team links on GitHub
  Fixed typos (#2721)
  Revert "update init-containers.md"
  Fix doc sentence
  Add Minikube reference in the Kubectl configuration doc
  Mention Minikube in the Kubectl configuration doc

# Conflicts:
#	docs/tasks/index.md
This commit is contained in:
Andrew Chen
2017-03-22 13:39:24 -07:00
parent 431ed22c3d 2d77413f91
commit 31221c3a76
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/tasks/access-application-cluster/load-balance-access-application-cluster.md
+1 -1
View File
@@ -4,7 +4,7 @@ title: Providing Load-Balanced Access to an Application in a Cluster
{% capture overview %}
This page shows how to create a Kubernetes Service object to that provides
This page shows how to create a Kubernetes Service object that provides
load-balanced access to an application running in a cluster.
{% endcapture %}
docs/tasks/index.md
+2 -2
View File
@@ -53,8 +53,8 @@ single thing, typically by giving a short sequence of steps.
* [Assigning Pods to Nodes](/docs/tasks/administer-cluster/assign-pods-nodes/)
* [Autoscaling the DNS Service in a Cluster](/docs/tasks/administer-cluster/dns-horizontal-autoscaling/)
* [Safely Draining a Node while Respecting Application SLOs](/docs/tasks/administer-cluster/safely-drain-node/)
* [Changing reclaim policy of a PersistentVolume](/docs/tasks/administer-cluster/change-pv-reclaim-policy/)
* [Changing the default StorageClass](/docs/tasks/administer-cluster/change-default-storage-class/)
* [Changing the Reclaim Policy of a PersistentVolume](/docs/tasks/administer-cluster/change-pv-reclaim-policy/)
* [Changing the Default StorageClass](/docs/tasks/administer-cluster/change-default-storage-class/)
#### Managing Stateful Applications
docs/tasks/kubectl/install.md
+1 -1
View File
@@ -104,7 +104,7 @@ sufficiently up-to-date using `kubectl version`.
## Configuring kubectl
In order for kubectl to find and access the Kubernetes cluster, it needs a [kubeconfig file](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/), which is created automatically when creating a cluster using kube-up.sh (see the [getting started guides](/docs/getting-started-guides/) for more about creating clusters). If you need access to a cluster you didn't create, see the [Sharing Cluster Access document](/docs/tasks/administer-cluster/share-configuration/).
In order for kubectl to find and access the Kubernetes cluster, it needs a [kubeconfig file](/docs/concepts/cluster-administration/authenticate-across-clusters-kubeconfig/), which is created automatically when creating a cluster using kube-up.sh or upon successful deployment of Minikube cluster (see the [getting started guides](/docs/getting-started-guides/) for more about creating clusters). If you need access to a cluster you didn't create, see the [Sharing Cluster Access document](/docs/tasks/administer-cluster/share-configuration/).
By default, kubectl configuration lives at `~/.kube/config`.
#### Making sure you're ready