From 3693d1cf3005a4405fb17354cfb37f041a3fccf2 Mon Sep 17 00:00:00 2001 From: James Sturtevant Date: Wed, 8 Jun 2022 17:40:20 +0000 Subject: [PATCH] updates from feedback --- .../tools/kubeadm/create-cluster-kubeadm.md | 4 ---- .../administer-cluster/kubeadm/upgrading-windows-nodes.md | 4 ++-- static/_redirects | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/content/en/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md b/content/en/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md index d70056e71f..d7897dfec5 100644 --- a/content/en/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md +++ b/content/en/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm.md @@ -336,10 +336,6 @@ The nodes are where your workloads (containers and Pods, etc) run. To add new no kubeadm join --token : --discovery-token-ca-cert-hash sha256: ``` -{{< 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: ```bash diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/upgrading-windows-nodes.md b/content/en/docs/tasks/administer-cluster/kubeadm/upgrading-windows-nodes.md index 9efe6d8c2f..a581cc16d3 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/upgrading-windows-nodes.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/upgrading-windows-nodes.md @@ -62,7 +62,7 @@ upgrade the control plane nodes before upgrading your Windows nodes. kubeadm upgrade node ``` -### Upgrade kubelet and kubeproxy +### Upgrade kubelet and kube-proxy 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 >}} -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 >}} ### Uncordon the node diff --git a/static/_redirects b/static/_redirects index 48a5005f56..c3d181f097 100644 --- a/static/_redirects +++ b/static/_redirects @@ -544,6 +544,7 @@ /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/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/multiple-zones/ /docs/setup/best-practices/multiple-zones/ 301 /docs/setup/cluster-large/ /docs/setup/best-practices/cluster-large/ 301