Merge remote-tracking branch 'upstream/master' into dev-1.19

content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md

@@ -274,7 +274,7 @@ kubeadm to tell it what to do.
 When using Docker, kubeadm will automatically detect the cgroup driver for the kubelet
 and set it in the `/var/lib/kubelet/config.yaml` file during runtime.
 
-If you are using a different CRI, you have to modify the file with your `cgroupDriver` value, like so:
+If you are using a different CRI, you must pass your `cgroupDriver` value to `kubeadm init`, like so:
 
 ```yaml
 apiVersion: kubelet.config.k8s.io/v1beta1
@@ -282,6 +282,8 @@ kind: KubeletConfiguration
 cgroupDriver: <value>
 ```
 
+For further details, please read [Using kubeadm init with a configuration file](/docs/reference/setup-tools/kubeadm/kubeadm-init/#config-file).
+
 Please mind, that you **only** have to do that if the cgroup driver of your CRI
 is not `cgroupfs`, because that is the default value in the kubelet already.
 

content/en/docs/setup/production-environment/tools/kubeadm/troubleshooting-kubeadm.md

@@ -403,4 +403,8 @@ nodeRegistration:
 Alternatively, you can modify `/etc/fstab` to make the `/usr` mount writeable, but please
 be advised that this is modifying a design principle of the Linux distribution.
 
+## `kubeadm upgrade plan` prints out `context deadline exceeded` error message
 
+This error message is shown when upgrading a Kubernetes cluster with `kubeadm` in the case of running an external etcd. This is not a critical bug and happens because older versions of kubeadm perform a version check on the external etcd cluster. You can proceed with `kubeadm upgrade apply ...`. 
+
+This issue is fixed as of version 1.19.