Skip to content

Commit 6541860

Browse files
authored
Merge pull request #32941 from chrisnegus/dockershim-shortcode-pages
Add dockershim shortcode to appropriate pages
2 parents 22d8641 + fcdf66a commit 6541860

File tree

5 files changed

+7
-4
lines changed

5 files changed

+7
-4
lines changed

content/en/docs/setup/production-environment/container-runtimes.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ You need to install a
1515
into each node in the cluster so that Pods can run there. This page outlines
1616
what is involved and describes related tasks for setting up nodes.
1717

18-
1918
Kubernetes {{< skew currentVersion >}} requires that you use a runtime that
2019
conforms with the
2120
{{< glossary_tooltip term_id="cri" text="Container Runtime Interface">}} (CRI).

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ card:
1414
This page shows how to install the `kubeadm` toolbox.
1515
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.
1616

17-
17+
{{% dockershim-removal %}}
1818

1919
## {{% heading "prerequisites" %}}
2020

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ weight: 80
1010

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

13+
{{% dockershim-removal %}}
14+
1315
The lifecycle of the kubeadm CLI tool is decoupled from the
1416
[kubelet](/docs/reference/command-line-tools-reference/kubelet), which is a daemon that runs
1517
on each node within the Kubernetes cluster. The kubeadm CLI tool is executed by the user when Kubernetes is

content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ weight: 30
1616

1717
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.
1818

19-
20-
19+
{{% dockershim-removal %}}
2120

2221
## {{% heading "prerequisites" %}}
2322
{{< version-check >}}

content/en/docs/tasks/network/customize-hosts-file-for-pods.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ min-kubernetes-server-version: 1.7
1111

1212
<!-- overview -->
1313

14+
{{% dockershim-removal %}}
15+
16+
1417
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.
1518

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

0 commit comments

Comments
 (0)