Merge branch 'master' into release-1.12

2018-10-17 19:10:16 -07:00
parent 01677e2710 548b538f72
commit 9a2e390e59
558 changed files with 71868 additions and 2594 deletions
@@ -150,6 +150,12 @@ Add an annotation for the cri-socket to the current node, for example to use doc
 kubectl annotate node <nodename> kubeadm.alpha.kubernetes.io/cri-socket=/var/run/dockershim.sock
 ```

+Apply the modified kubeadm-config on the node:
+
+```shell
+kubectl apply -f kubeadm-config-cm.yaml --force
+```
+
 Start the upgrade:

 ```shell
@@ -237,4 +243,4 @@ If the upgrade fails, see whether one of the following scenarios applies:

 - If `kubeadm upgrade apply` on one of the secondary masters failed, the cluster is upgraded and working, but the secondary masters are in an undefined state. You need to investigate further and join the secondaries manually.

-{{% /capture %}}
+{{% /capture %}}