From ebc817852f8138850a0a01edf910fecd885ad808 Mon Sep 17 00:00:00 2001 From: Christopher Negus Date: Thu, 14 Apr 2022 22:02:34 +0000 Subject: [PATCH 1/2] Add dockershim shortcode to other files --- .../production-environment/tools/kubeadm/install-kubeadm.md | 2 +- .../tools/kubeadm/kubelet-integration.md | 2 ++ .../tasks/administer-cluster/kubeadm/adding-windows-nodes.md | 3 +-- content/en/docs/tasks/network/customize-hosts-file-for-pods.md | 3 +++ 4 files changed, 7 insertions(+), 3 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 917c384766..b7c0fd46ca 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,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" %}} 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 4625299919..1da01fecce 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,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 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 e48550e40b..a5739616bd 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,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 >}} 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 7eba61fbea..3ed2b0ed6a 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,6 +11,9 @@ 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. From fcdf66a1fdbda6c236848a94e8b2dc2c300a9d02 Mon Sep 17 00:00:00 2001 From: Christopher Negus Date: Mon, 18 Apr 2022 23:32:41 +0000 Subject: [PATCH 2/2] Deleted a blank line --- .../en/docs/setup/production-environment/container-runtimes.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md index a75964f477..8c5e744502 100644 --- a/content/en/docs/setup/production-environment/container-runtimes.md +++ b/content/en/docs/setup/production-environment/container-runtimes.md @@ -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).