kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updates from feedback

pull/33324/head
James Sturtevant 2022-06-08 17:40:20 +00:00 committed by GitHub
parent f875adcb50
commit 3693d1cf30
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/en/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md
View File

@ -336,10 +336,6 @@ The nodes are where your workloads (containers and Pods, etc) run. To add new no
kubeadm join --token <token> <control-plane-host>:<control-plane-port> --discovery-token-ca-cert-hash sha256:<hash> kubeadm join --token <token> <control-plane-host>:<control-plane-port> --discovery-token-ca-cert-hash sha256:<hash>
``` ```
{{< note >}}
On Windows you should specify the `--cri-socket` parameter in the `kubeadm join` command. The default path is "npipe:////./pipe/containerd-containerd" for containerd.
{{< /note >}}
If you do not have the token, you can get it by running the following command on the control-plane node: If you do not have the token, you can get it by running the following command on the control-plane node:
```bash ```bash

4
content/en/docs/tasks/administer-cluster/kubeadm/upgrading-windows-nodes.md
View File

@ -62,7 +62,7 @@ upgrade the control plane nodes before upgrading your Windows nodes.
kubeadm upgrade node kubeadm upgrade node
``` ```
### Upgrade kubelet and kubeproxy ### Upgrade kubelet and kube-proxy
1. From the Windows node, upgrade and restart the kubelet: 1. From the Windows node, upgrade and restart the kubelet:
@ -81,7 +81,7 @@ upgrade the control plane nodes before upgrading your Windows nodes.
``` ```
{{< note >}} {{< note >}}
If you are running kube-proxy in a HostProcess Container instead of a Windows Service, you can upgrade kube-proxy by applying a newer version of your kube-proxy manifests. If you are running kube-proxy in a HostProcess container within a Pod, and not as a Windows Service, you can upgrade kube-proxy by applying a newer version of your kube-proxy manifests.
{{< /note >}} {{< /note >}}
### Uncordon the node ### Uncordon the node

1
static/_redirects
View File

@ -544,6 +544,7 @@
/docs/setup/windows/intro-windows-in-kubernetes/ /docs/setup/production-environment/windows/intro-windows-in-kubernetes/ 301 /docs/setup/windows/intro-windows-in-kubernetes/ /docs/setup/production-environment/windows/intro-windows-in-kubernetes/ 301
/docs/setup/windows/user-guide-windows-nodes/ /docs/tasks/administer-cluster/kubeadm/adding-windows-nodes/ 301 /docs/setup/windows/user-guide-windows-nodes/ /docs/tasks/administer-cluster/kubeadm/adding-windows-nodes/ 301
/docs/setup/production-environment/windows/user-guide-windows-nodes/ /docs/tasks/administer-cluster/kubeadm/adding-windows-nodes/ 301 /docs/setup/production-environment/windows/user-guide-windows-nodes/ /docs/tasks/administer-cluster/kubeadm/adding-windows-nodes/ 301
/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes/ /docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/ 301
/docs/setup/windows/user-guide-windows-containers/ /docs/setup/production-environment/windows/user-guide-windows-containers/ 301 /docs/setup/windows/user-guide-windows-containers/ /docs/setup/production-environment/windows/user-guide-windows-containers/ 301
/docs/setup/multiple-zones/ /docs/setup/best-practices/multiple-zones/ 301 /docs/setup/multiple-zones/ /docs/setup/best-practices/multiple-zones/ 301
/docs/setup/cluster-large/ /docs/setup/best-practices/cluster-large/ 301 /docs/setup/cluster-large/ /docs/setup/best-practices/cluster-large/ 301