Merge remote-tracking branch 'upstream/main' into dev-1.24

2022-04-26 13:11:13 -07:00
parent 95859dd9df 6b15373d61
commit 712f45dee4
129 changed files with 4560 additions and 1998 deletions
@@ -16,7 +16,6 @@ weight: 30

 You can use Kubernetes to run a mixture of Linux and Windows nodes, so you can mix Pods that run on Linux on with Pods that run on Windows. This page shows how to register Windows nodes to your cluster.

-{{% dockershim-removal %}}

 ## {{% heading "prerequisites" %}}
 {{< version-check >}}