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

2022-02-21 10:36:03 -08:00
parent ad150d9c0b 0c8eab971c
commit e8b19637df
48 changed files with 2470 additions and 387 deletions
@@ -16,7 +16,7 @@ A Kubernetes cluster can be divided into namespaces. Once you have a namespace t
 has a default memory
 [limit](/docs/concepts/configuration/manage-resources-containers/#requests-and-limits),
 and you then try to create a Pod with a container that does not specify its own memory
-limit its own memory limit, then the
+limit, then the
 {{< glossary_tooltip text="control plane" term_id="control-plane" >}} assigns the default
 memory limit to that container.

@@ -11,7 +11,8 @@ dockershim to other container runtimes.

 Since the announcement of [dockershim deprecation](/blog/2020/12/08/kubernetes-1-20-release-announcement/#dockershim-deprecation)
 in Kubernetes 1.20, there were questions on how this will affect various workloads and Kubernetes
-installations. You can find this blog post useful to understand the problem better: [Dockershim Deprecation FAQ](/blog/2020/12/02/dockershim-faq/)
+installations. Our [Dockershim Removal FAQ](/blog/2022/02/17/dockershim-faq/) is there to help you
+to understand the problem better.

 It is recommended to migrate from dockershim to alternative container runtimes.
 Check out [container runtimes](/docs/setup/production-environment/container-runtimes/)