Merge pull request #25883 from sculley/fix-upgrade-kubeadm-docs-release-1.19

re-positioned drain/uncorden steps in kubeadm upgrade docs in release-1.19
pull/26143/head
Kubernetes Prow Robot 2020-12-31 16:25:52 -08:00 committed by GitHub
commit 229e32812e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 22 deletions

View File

@ -92,13 +92,6 @@ Find the latest stable 1.19 version:
kubeadm version
```
- Drain the control plane node:
```shell
# replace <cp-node-name> with the name of your control plane node
kubectl drain <cp-node-name> --ignore-daemonsets
```
- On the control plane node, run:
```shell
@ -266,13 +259,6 @@ Failing to do so will cause `kubeadm upgrade apply` to exit with an error and no
This step is not required on additional control plane nodes if the CNI provider runs as a DaemonSet.
- Uncordon the control plane node:
```shell
# replace <cp-node-name> with the name of your control plane node
kubectl uncordon <cp-node-name>
```
### Upgrade additional control plane nodes
Same as the first control plane node but use:
@ -289,6 +275,15 @@ sudo kubeadm upgrade apply
Also `sudo kubeadm upgrade plan` is not needed.
### Drain the control plane node
- Prepare the node for maintenance by marking it unschedulable and evicting the workloads:
```shell
# replace <cp-node-name> with the name of your control plane node
kubectl drain <cp-node-name> --ignore-daemonsets
```
### Upgrade kubelet and kubectl
Upgrade the kubelet and kubectl on all control plane nodes:
@ -317,6 +312,15 @@ sudo systemctl daemon-reload
sudo systemctl restart kubelet
```
### Uncordon the control plane node
- Bring the node back online by marking it schedulable:
```shell
# replace <cp-node-name> with the name of your control plane node
kubectl uncordon <cp-node-name>
```
## Upgrade worker nodes
The upgrade procedure on worker nodes should be executed one node at a time or few nodes at a time,
@ -343,6 +347,14 @@ without compromising the minimum required capacity for running your workloads.
{{% /tab %}}
{{< /tabs >}}
### Upgrade the kubelet configuration
- Call the following command:
```shell
sudo kubeadm upgrade node
```
### Drain the node
- Prepare the node for maintenance by marking it unschedulable and evicting the workloads:
@ -360,14 +372,6 @@ without compromising the minimum required capacity for running your workloads.
node/ip-172-31-85-18 drained
```
### Upgrade the kubelet configuration
- Call the following command:
```shell
sudo kubeadm upgrade node
```
### Upgrade kubelet and kubectl
- Upgrade the kubelet and kubectl on all worker nodes: