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

* 'master' of https://github.com/kubernetes/kubernetes.github.io: Replace the tab with 4 spaces in md files (#2797) fix link error Replace the tab with 4 spaces in html files hitting the `ClusterIP` from a pod (#2826) # Conflicts: # docs/admin/accessing-the-api.md # docs/api-reference/extensions/v1beta1/definitions.html # docs/getting-started-guides/kubeadm.md # docs/user-guide/kubectl/index.md
2017-03-23 00:19:33 -07:00
parent ce8507c515 9ce54855d5
commit 996723bc8f
104 changed files with 9776 additions and 3212 deletions
@@ -52,8 +52,8 @@ yum -y install --enablerepo=virt7-docker-common-release kubernetes etcd flannel
 * Add master and node to /etc/hosts on all machines (not needed if hostnames already in DNS)

 ```shell
-echo "192.168.121.9	centos-master
-192.168.121.65	centos-minion-1
+echo "192.168.121.9    centos-master
+192.168.121.65    centos-minion-1
 192.168.121.66  centos-minion-2
 192.168.121.67  centos-minion-3" >> /etc/hosts
 ```
@@ -147,9 +147,9 @@ FLANNEL_ETCD_PREFIX="/kube-centos/network"

 ```shell
 for SERVICES in etcd kube-apiserver kube-controller-manager kube-scheduler flanneld; do
-	systemctl restart $SERVICES
-	systemctl enable $SERVICES
-	systemctl status $SERVICES
+    systemctl restart $SERVICES
+    systemctl enable $SERVICES
+    systemctl status $SERVICES
 done
 ```

@@ -77,10 +77,10 @@ SSH to it using the key that was created and using the _core_ user and you can l

    $ ssh -i ~/.ssh/id_rsa_k8s core@<master IP>
    $ fleetctl list-machines
-    MACHINE		IP		       METADATA
-    a017c422...	<node #1 IP>   role=node
-    ad13bf84...	<master IP>	   role=master
-    e9af8293...	<node #2 IP>   role=node
+    MACHINE        IP               METADATA
+    a017c422...    <node #1 IP>   role=node
+    ad13bf84...    <master IP>       role=master
+    e9af8293...    <node #2 IP>   role=node

 ## Support Level

@@ -48,8 +48,8 @@ dnf -y install etcd
 * Add master and node to /etc/hosts on all machines (not needed if hostnames already in DNS). Make sure that communication works between fed-master and fed-node by using a utility such as ping.

 ```shell
-echo "192.168.121.9	fed-master
-192.168.121.65	fed-node" >> /etc/hosts
+echo "192.168.121.9    fed-master
+192.168.121.65    fed-node" >> /etc/hosts
 ```

 * Edit /etc/kubernetes/config (which should be the same on all hosts) to set
@@ -95,9 +95,9 @@ ETCD_LISTEN_CLIENT_URLS="http://0.0.0.0:2379"

 ```shell
 for SERVICES in etcd kube-apiserver kube-controller-manager kube-scheduler; do
-	systemctl restart $SERVICES
-	systemctl enable $SERVICES
-	systemctl status $SERVICES
+    systemctl restart $SERVICES
+    systemctl enable $SERVICES
+    systemctl status $SERVICES
 done
 ```

@@ -15,7 +15,7 @@ This guide will set up a simple Kubernetes cluster with a single Kubernetes mast

 - This guide uses `systemd` for process management. Ubuntu 15.04 supports systemd natively as do a number of other Linux distributions.
 - All machines should have Docker >= 1.7.0 installed.
-	- To install Docker on Ubuntu, follow [these instructions](https://docs.docker.com/installation/ubuntulinux/)
+- To install Docker on Ubuntu, follow [these instructions](https://docs.docker.com/installation/ubuntulinux/)
 - All machines should have connectivity to each other and the internet.
 - This guide assumes a DHCP server on your network to assign server IPs.
 - This guide uses `192.168.0.0/16` as the subnet from which pod IP addresses are assigned.  If this overlaps with your host subnet, you will need to configure Calico to use a different [IP pool](https://github.com/projectcalico/calico-containers/blob/master/docs/calicoctl/pool.md#calicoctl-pool-commands).
@@ -70,7 +70,7 @@ At this stage, you can query the controller model as well:
 ```
 juju status
 Model       Controller  Cloud/Region   Version
-controller  k8s		   lxd/localhost  2.0.2
+controller  k8s           lxd/localhost  2.0.2

 App  Version  Status  Scale  Charm  Store  Rev  OS  Notes

@@ -142,16 +142,16 @@ If the deployment is larger the following commands will run on all units success

 ```
 juju show-status kubernetes-master --format json | \
-	jq --raw-output '.applications."kubernetes-master".units | keys[]' | \
-	xargs -I UNIT juju ssh UNIT "sudo sed -i 's/KUBE_API_ARGS=\"/KUBE_API_ARGS=\"--allow-privileged\ /' /etc/default/kube-apiserver && sudo systemctl restart kube-apiserver.service"
+    jq --raw-output '.applications."kubernetes-master".units | keys[]' | \
+    xargs -I UNIT juju ssh UNIT "sudo sed -i 's/KUBE_API_ARGS=\"/KUBE_API_ARGS=\"--allow-privileged\ /' /etc/default/kube-apiserver && sudo systemctl restart kube-apiserver.service"
 ```

 2. Update all workers

 ```
 juju show-status kubernetes-worker --format json | \
-	jq --raw-output '.applications."kubernetes-worker".units | keys[]' | \
-	xargs -I UNIT juju ssh UNIT "sudo sed -i 's/KUBELET_ARGS=\"/KUBELET_ARGS=\"--allow-privileged\ /' /etc/default/kubelet && sudo systemctl restart kubelet.service"
+    jq --raw-output '.applications."kubernetes-worker".units | keys[]' | \
+    xargs -I UNIT juju ssh UNIT "sudo sed -i 's/KUBELET_ARGS=\"/KUBELET_ARGS=\"--allow-privileged\ /' /etc/default/kubelet && sudo systemctl restart kubelet.service"
 ```


@@ -71,7 +71,7 @@ Sample Config:
        working-dir = <Folder in which VMs are provisioned, can be null>
        vm-uuid = <VM Instance UUID of virtual machine which can be retrieved from instanceUuid property in VmConfigInfo, or also set as vc.uuid in VMX file. If empty, will be retrieved from sysfs (requires root)>
 [Disk]
-	scsicontrollertype = pvscsi
+    scsicontrollertype = pvscsi
 ```

 * Set the cloud provider via ```--cloud-provider=vsphere``` flag for each instance of kubelet, apiserver and controller manager.