Merge pull request #32941 from chrisnegus/dockershim-shortcode-pages

Add dockershim shortcode to appropriate pages
2022-04-18 17:17:50 -07:00
parent 22d86412bf fcdf66a1fd
commit 6541860e63
5 changed files with 7 additions and 4 deletions
@@ -15,7 +15,6 @@ You need to install a
 into each node in the cluster so that Pods can run there. This page outlines
 what is involved and describes related tasks for setting up nodes.

-
 Kubernetes {{< skew currentVersion >}} requires that you use a runtime that
 conforms with the
 {{< glossary_tooltip term_id="cri" text="Container Runtime Interface">}} (CRI).
@@ -14,7 +14,7 @@ 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" %}}

@@ -10,6 +10,8 @@ weight: 80

 {{< feature-state for_k8s_version="v1.11" state="stable" >}}

+{{% dockershim-removal %}}
+
 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
@@ -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 >}}
@@ -11,6 +11,9 @@ min-kubernetes-server-version: 1.7

 <!-- overview -->

+{{% dockershim-removal %}}
+
+
 Adding entries to a Pod's `/etc/hosts` file provides Pod-level override of hostname resolution when DNS and other options are not applicable. You can add these custom entries with the HostAliases field in PodSpec.

 Modification not using HostAliases is not suggested because the file is managed by the kubelet and can be overwritten on during Pod creation/restart.