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

content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md

@@ -14,7 +14,6 @@ card:
 This page shows how to install the `kubeadm` toolbox.
 For information on how to create a cluster with kubeadm once you have performed this installation process, see the [Using kubeadm to Create a Cluster](/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/) page.
 
-{{% dockershim-removal %}}
 
 ## {{% heading "prerequisites" %}}
 

content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md

@@ -10,6 +10,8 @@ weight: 80
 
 {{% dockershim-removal %}}
 
+{{< feature-state for_k8s_version="v1.11" state="stable" >}}
+
 The lifecycle of the kubeadm CLI tool is decoupled from the
 [kubelet](/docs/reference/command-line-tools-reference/kubelet), which is a daemon that runs
 on each node within the Kubernetes cluster. The kubeadm CLI tool is executed by the user when Kubernetes is