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

2022-04-19 15:45:28 -07:00
parent eb71e596a3 f23de579b3
commit 0135d3642b
163 changed files with 7079 additions and 2699 deletions
@@ -16,8 +16,7 @@ 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 >}}