merge master to 1.10, with fixes (#7682)

docs/reference/setup-tools/kubeadm/generated/kubeadm_completion.md

@@ -6,7 +6,7 @@ Output shell completion code for the specified shell (bash or zsh).
 
 
 Output shell completion code for the specified shell (bash or zsh).
-The shell code must be evalutated to provide interactive
+The shell code must be evaluated to provide interactive
 completion of kubeadm commands. This can be done by sourcing it from
 the .bash_profile.
 

docs/reference/setup-tools/kubeadm/implementation-details.md

@@ -59,7 +59,7 @@ in a majority of cases, and the most intuitive location; other constants paths a
     - `apiserver.crt`, `apiserver.key` for the API server certificate
     - `apiserver-kubelet-client.crt`, `apiserver-kubelet-client.key` for the client certificate used by the API server to connect to the kubelets securely
     - `sa.pub`, `sa.key` for the key used by the controller manager when signing ServiceAccount
-    - `front-proxy-ca.crt`, `front-proxy-ca.key` for the the front proxy certificate authority
+    - `front-proxy-ca.crt`, `front-proxy-ca.key` for the front proxy certificate authority
     - `front-proxy-client.crt`, `front-proxy-client.key` for the front proxy client
 
 ## kubeadm init workflow internal design
@@ -200,7 +200,7 @@ Static Pod manifest share a set of common properties:
 - Leader election is enabled for both the controller-manager and the scheduler
 - Controller-manager and the scheduler will reference kubeconfig files with their respective, unique identities
 - All static Pods gets any extra flags specified by the user as described in [passing custom arguments to control plane components](kubeadm-init.md/#custom-args)
-- All static Pods gets any extra extra Volumes specified by the user (Host path)
+- All static Pods gets any extra Volumes specified by the user (Host path)
 
 Please note that:
 
@@ -401,7 +401,7 @@ RBAC role `system:node-bootstrapper`.
 
 #### Setup auto approval for new bootstrap tokens
 
-Kubeadm ensures that the Boostrap Token will get its CSR request automatically approved by the the csrapprover controller.
+Kubeadm ensures that the Boostrap Token will get its CSR request automatically approved by the csrapprover controller.
 
 This is implemented by creating ClusterRoleBinding named `kubeadm:node-autoapprove-bootstrap` between 
 the  `system:bootstrappers:kubeadm:default-node-token` group and the default role `system:certificates.k8s.io:certificatesigningrequests:nodeclient`.
@@ -412,7 +412,7 @@ POST permission to `/apis/certificates.k8s.io/certificatesigningrequests/nodecli
 #### Setup nodes certificate rotation with auto approval
 
 Kubeadm ensures that certificate rotation is enabled for nodes, and that new certificate request for nodes will get its CSR request 
-automatically approved by the the csrapprover controller.
+automatically approved by the csrapprover controller.
 
 This is implemented by creating ClusterRoleBinding named `kubeadm:node-autoapprove-certificate-rotation` between the  `system:nodes` group 
 and the default role `system:certificates.k8s.io:certificatesigningrequests:selfnodeclient`.
@@ -570,7 +570,7 @@ If kubeadm is invoked with `--feature-gates=DynamicKubeletConfig`:
 1. Read the kubelet base configuration from the `kubelet-base-config-v1.9` ConfigMap in the `kube-system` namespace  using the
    Bootstrap Token credentials, and write it to disk as kubelet init configuration file  `/var/lib/kubelet/config/init/kubelet`
 2. As soon as kubelet starts with the Node's own credential (`/etc/kubernetes/kubelet.conf`), update current node configuration 
-   specifying that the the source for the node/kubelet configuration is the above ConfigMap.
+   specifying that the source for the node/kubelet configuration is the above ConfigMap.
 
 Please note that:
 

docs/reference/setup-tools/kubeadm/kubeadm-init.md

@@ -289,6 +289,7 @@ The container runtime used by default is Docker, which is enabled through the bu
 
 Other CRI-based runtimes include:
 
+- [cri-containerd](https://github.com/containerd/cri-containerd)
 - [cri-o](https://github.com/kubernetes-incubator/cri-o)
 - [frakti](https://github.com/kubernetes/frakti)
 - [rkt](https://github.com/kubernetes-incubator/rktlet)

docs/reference/setup-tools/kubeadm/kubeadm-upgrade.md

@@ -21,6 +21,8 @@ Please check these documents out for more detailed how-to-upgrade guidance:
  * [1.7.x to 1.7.y upgrades](/docs/tasks/administer-cluster/kubeadm-upgrade-1-8/)
  * [1.7 to 1.8 upgrades](/docs/tasks/administer-cluster/kubeadm-upgrade-1-8/)
  * [1.8.x to 1.8.y upgrades](/docs/tasks/administer-cluster/kubeadm-upgrade-1-8/)
+ * [1.8.x to 1.9.x upgrades](/docs/tasks/administer-cluster/kubeadm-upgrade-1-9/)
+ * [1.9.x to 1.9.y upgrades](/docs/tasks/administer-cluster/kubeadm-upgrade-1-9/)
 
 ## kubeadm upgrade plan {#cmd-upgrade-plan}
 {% include_relative generated/kubeadm_upgrade_plan.md %}

docs/reference/setup-tools/kubeadm/kubeadm.md

@@ -5,7 +5,7 @@ approvers:
 - jbeda
 title: Overview of kubeadm
 ---
-<img src="https://raw.githubusercontent.com/cncf/artwork/master/kubernetes/certified-kubernetes/versionless/color/certified_kubernetes_color.png" align="right" width="150px">Kubeadm is a tool built to provide `kubeadm init` and `kubeadm join` as best-practice “fast paths” for creating Kubernetes clusters. 
+<img src="https://raw.githubusercontent.com/cncf/artwork/master/kubernetes/certified-kubernetes/versionless/color/certified-kubernetes-color.png" align="right" width="150px">Kubeadm is a tool built to provide `kubeadm init` and `kubeadm join` as best-practice “fast paths” for creating Kubernetes clusters. 
 
 kubeadm performs the actions necessary to get a minimum viable cluster up and running. By design, it cares only about bootstrapping, not about provisioning machines. Likewise, installing various nice-to-have addons, like the Kubernetes Dashboard, monitoring solutions, and cloud-specific addons, is not in scope.