Merge pull request #30705 from jlbutler/merged-main-dev-1.23

Periodic integration branch sync for 1.23

content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md

@@ -158,7 +158,7 @@ Install-WindowsFeature -Name containers
 ```
 
 Install Docker
-Instructions to do so are available at [Install Docker Engine - Enterprise on Windows Servers](https://hub.docker.com/editions/enterprise/docker-ee-server-windows).
+Instructions to do so are available at [Install Docker Engine - Enterprise on Windows Servers](https://docs.microsoft.com/en-us/virtualization/windowscontainers/quick-start/set-up-environment?tabs=Windows-Server#install-docker).
 
 #### Install wins, kubelet, and kubeadm  
 

content/en/docs/tasks/configure-pod-container/translate-compose-kubernetes.md

@@ -150,13 +150,12 @@ you need is an existing `docker-compose.yml` file.
    ```
 
    ```bash
-    kubectl apply -f frontend-service.yaml,redis-master-service.yaml,redis-slave-service.yaml,frontend-deployment.yaml,
+    kubectl apply -f frontend-service.yaml,redis-master-service.yaml,redis-slave-service.yaml,frontend-deployment.yaml,redis-master-deployment.yaml,redis-slave-deployment.yaml
    ```
 
    The output is similar to:
 
    ```none
-   redis-master-deployment.yaml,redis-slave-deployment.yaml
    service/frontend created
    service/redis-master created
    service/redis-slave created

content/en/docs/tasks/extend-kubernetes/setup-konnectivity.md

@@ -11,7 +11,11 @@ communication.
 
 ## {{% heading "prerequisites" %}}
 
-{{< include "task-tutorial-prereqs.md" >}}
+You need to have a Kubernetes cluster, and the kubectl command-line tool must
+be configured to communicate with your cluster. It is recommended to run this
+tutorial on a cluster with at least two nodes that are not acting as control
+plane hosts. If you do not already have a cluster, you can create one by using
+[minikube](https://minikube.sigs.k8s.io/docs/tutorials/multi_node/).
 
 <!-- steps -->
 

content/en/docs/tasks/tls/managing-tls-in-a-cluster.md

@@ -162,9 +162,19 @@ Events: <none>
 
 ## Get the Certificate Signing Request Approved
 
-Approving the certificate signing request is either done by an automated
-approval process or on a one off basis by a cluster administrator. More
-information on what this involves is covered below.
+Approving the [certificate signing request](/docs/reference/access-authn-authz/certificate-signing-requests/)
+is either done by an automated approval process or on a one off basis by a cluster
+administrator. If you're authorized to approve a certificate request, you can do that
+manually using `kubectl`; for example:
+
+```shell
+kubectl certificate approve my-svc.my-namespace
+```
+
+```none
+certificatesigningrequest.certificates.k8s.io/my-svc.my-namespace approved
+```
+
 
 ## Download the Certificate and Use It
 

content/en/docs/tasks/tools/included/optional-kubectl-configs-zsh.md

@@ -16,7 +16,7 @@ If you have an alias for kubectl, you can extend shell completion to work with t
 
 ```zsh
 echo 'alias k=kubectl' >>~/.zshrc
-echo 'complete -F __start_kubectl k' >>~/.zshrc
+echo 'compdef __start_kubectl k' >>~/.zshrc
 ```
 
 After reloading your shell, kubectl autocompletion should be working.