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
@@ -488,7 +488,6 @@
 /editdocs/     /docs/contribute/     301
 /docs/home/editdocs/  /docs/contribute/ 301

-
 /docs/admin/accessing-the-api/     /docs/concepts/overview/kubernetes-api/ 301
 /docs/admin/admission-controllers/     /docs/reference/access-authn-authz/admission-controllers/ 301
 /docs/admin/authentication/     /docs/reference/access-authn-authz/authentication/ 301
@@ -502,9 +501,14 @@
 /docs/admin/authorization/webhook/     /docs/reference/access-authn-authz/webhook/ 301
 /docs/admin/authorization/     /docs/reference/access-authn-authz/authorization/ 301
 /docs/admin/high-availability/building/     /docs/setup/production-environment/tools/kubeadm/high-availability/   301
+
 /code-of-conduct/     /community/code-of-conduct/   301
 /values/     /community/values/   302

+/dockershim /blog/2022/02/17/dockershim-faq/ 302
+/dockershim/ /blog/2022/02/17/dockershim-faq/ 302
+
+
 /docs/setup/release/notes/     /releases/notes/   302
 /docs/setup/release/                 /releases/   301
 /docs/setup/version-skew-policy/     /releases/version-skew-policy/   301