Skip to content

Commit 28cea36

Browse files
committed
revert changes from PR 32941 that merged before 1.24 release
1 parent f23de57 commit 28cea36

File tree

4 files changed

+0
-7
lines changed

4 files changed

+0
-7
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ 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-
{{% dockershim-removal %}}
1817

1918
## {{% heading "prerequisites" %}}
2019

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

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

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

13-
{{% dockershim-removal %}}
14-
1513
The lifecycle of the kubeadm CLI tool is decoupled from the
1614
[kubelet](/docs/reference/command-line-tools-reference/kubelet), which is a daemon that runs
1715
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ 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-
{{% dockershim-removal %}}
2019

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

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

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

1212
<!-- overview -->
1313

14-
{{% dockershim-removal %}}
15-
16-
1714
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.
1815

1916
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)