From 28cea36e93b7eda87bfbb595f2d76cdf031e821a Mon Sep 17 00:00:00 2001 From: Rey Lejano Date: Tue, 19 Apr 2022 14:50:25 -0700 Subject: [PATCH] revert changes from PR 32941 that merged before 1.24 release --- .../production-environment/tools/kubeadm/install-kubeadm.md | 1 - .../tools/kubeadm/kubelet-integration.md | 2 -- .../tasks/administer-cluster/kubeadm/adding-windows-nodes.md | 1 - content/en/docs/tasks/network/customize-hosts-file-for-pods.md | 3 --- 4 files changed, 7 deletions(-) diff --git a/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md b/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md index 9ec735bd771..45c8717a83b 100644 --- a/content/en/docs/setup/production-environment/tools/kubeadm/install-kubeadm.md +++ b/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" %}} diff --git a/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md b/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md index 1da01feccec..46252999197 100644 --- a/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md +++ b/content/en/docs/setup/production-environment/tools/kubeadm/kubelet-integration.md @@ -10,8 +10,6 @@ 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 diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md b/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md index a5739616bd1..54efcd3d39f 100644 --- a/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md +++ b/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md @@ -16,7 +16,6 @@ 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 >}} diff --git a/content/en/docs/tasks/network/customize-hosts-file-for-pods.md b/content/en/docs/tasks/network/customize-hosts-file-for-pods.md index 3ed2b0ed6ad..7eba61fbea9 100644 --- a/content/en/docs/tasks/network/customize-hosts-file-for-pods.md +++ b/content/en/docs/tasks/network/customize-hosts-file-for-pods.md @@ -11,9 +11,6 @@ min-kubernetes-server-version: 1.7 -{{% 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.