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

* 'master' of https://github.com/kubernetes/kubernetes.github.io: (87 commits)
  fix envFrom in configmap
  Add link to example for CRDs (#5641)
  Fixed links to architecture.md and principles.md
  Polish AppArmor tutorial
  Remove dangling files related to apparmor
  fix the typo of serviceaccount (#5533)
  Correct setup link (#5634)
  relink the  persistent volume of petset (#5582)
  Updates to case study landing page (#5629)
  translate doc resource-quotas into chinese
  minor encoding fix for CN page
  fix typo
  concepts-overview-components+abac-fix
  concepts-overview-components-fix
  Update links to avoid redirects. (#5627)
  Update links to avoid redirects. (#5625)
  Fix 404s. (#5624)
  Fix 404s. (#5623)
  Edits cpu-constraint-namespace.md
  Fix index redirects (#5502)
  ...

# Conflicts:
#	_redirects
#	docs/concepts/storage/volumes.md
#	docs/concepts/workloads/controllers/daemonset.md
#	docs/concepts/workloads/controllers/petset.md
#	docs/concepts/workloads/controllers/statefulset.md
#	docs/tasks/run-application/run-single-instance-stateful-application.md
#	docs/tutorials/stateful-application/zookeeper.md

docs/setup/independent/create-cluster-kubeadm.md

@@ -258,7 +258,6 @@ kubectl apply -f https://raw.githubusercontent.com/projectcalico/canal/master/k8
 
 ```shell
 kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml
-kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel-rbac.yml
 ```
 {% endcapture %}
 

docs/setup/independent/install-kubeadm.md

@@ -39,7 +39,7 @@ This page shows how to use install kubeadm.
 |-------------|---------------------------------|
 | 10250       | Kubelet API                     |
 | 10255       | Read-only Kubelet API (Heapster)|
-| 30000-32767 | Default port range for [NodePort Services](/docs/concepts/services-networking/service). Typically, these ports would need to be exposed to external load-balancers, or other external consumers of the application itself. |
+| 30000-32767 | Default port range for [NodePort Services](/docs/concepts/services-networking/service/). Typically, these ports would need to be exposed to external load-balancers, or other external consumers of the application itself. |
 
 Any port numbers marked with * are overridable, so you will need to ensure any
 custom ports you provide are also open.
@@ -127,7 +127,8 @@ example. You have to do this until SELinux support is improved in the kubelet.
 
 {% capture whatsnext %}
 
-* [Using kubeadm to Create a Cluster](/docs/getting-started-guides/kubeadm/)
+* [Using kubeadm to Create a
+  Cluster](/docs/setup/independent/create-cluster-kubeadm/)
 
 {% endcapture %}