From 1fb9324fc3ff2d6740bca85ec936efc2ab547bed Mon Sep 17 00:00:00 2001 From: ystkfujii Date: Wed, 15 Dec 2021 14:32:10 +0900 Subject: [PATCH 1/2] remove the section on dockershim --- content/en/docs/concepts/containers/runtime-class.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/content/en/docs/concepts/containers/runtime-class.md b/content/en/docs/concepts/containers/runtime-class.md index 96858d32af..9e7efa0a46 100644 --- a/content/en/docs/concepts/containers/runtime-class.md +++ b/content/en/docs/concepts/containers/runtime-class.md @@ -107,11 +107,6 @@ to the behavior when the RuntimeClass feature is disabled. For more details on setting up CRI runtimes, see [CRI installation](/docs/setup/production-environment/container-runtimes/). -#### dockershim - -RuntimeClasses with dockershim must set the runtime handler to `docker`. Dockershim does not support -custom configurable runtime handlers. - #### {{< glossary_tooltip term_id="containerd" >}} Runtime handlers are configured through containerd's configuration at From 19928a83fa5515a7e8188e4c7c65420b8715127f Mon Sep 17 00:00:00 2001 From: ystkfujii Date: Wed, 15 Dec 2021 21:51:06 +0900 Subject: [PATCH 2/2] Change the dockershim state to deprecation --- content/en/docs/concepts/containers/runtime-class.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/content/en/docs/concepts/containers/runtime-class.md b/content/en/docs/concepts/containers/runtime-class.md index 9e7efa0a46..849cd98782 100644 --- a/content/en/docs/concepts/containers/runtime-class.md +++ b/content/en/docs/concepts/containers/runtime-class.md @@ -107,6 +107,16 @@ to the behavior when the RuntimeClass feature is disabled. For more details on setting up CRI runtimes, see [CRI installation](/docs/setup/production-environment/container-runtimes/). +#### dockershim + +{{< feature-state for_k8s_version="v1.20" state="deprecated" >}} + +Dockershim is deprecated as of Kubernetes v1.20, and will be removed in v1.24. For more information on the deprecation, +see [dockershim deprecation](/blog/2020/12/08/kubernetes-1-20-release-announcement/#dockershim-deprecation) + +RuntimeClasses with dockershim must set the runtime handler to `docker`. Dockershim does not support +custom configurable runtime handlers. + #### {{< glossary_tooltip term_id="containerd" >}} Runtime handlers are configured through containerd's configuration at