From 6d560379a86ab5fd82fe5754fd27ae1f4646e18b Mon Sep 17 00:00:00 2001
From: Christopher Negus <striker57@gmail.com>
Date: Fri, 8 Apr 2022 20:50:28 +0000
Subject: [PATCH 1/2] Create dockershim shortcode

---
 .../en/docs/setup/production-environment/container-runtimes.md | 2 ++
 data/i18n/en/en.toml                                           | 3 +++
 layouts/shortcodes/dockershim-removal.html                     | 3 +++
 3 files changed, 8 insertions(+)
 create mode 100644 layouts/shortcodes/dockershim-removal.html

diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md
index 3d351c4dda..a4f14c7026 100644
--- a/content/en/docs/setup/production-environment/container-runtimes.md
+++ b/content/en/docs/setup/production-environment/container-runtimes.md
@@ -8,6 +8,8 @@ weight: 20
 ---
 <!-- overview -->
 
+{{% dockershim-removal %}}
+
 You need to install a
 {{< glossary_tooltip text="container runtime" term_id="container-runtime" >}}
 into each node in the cluster so that Pods can run there. This page outlines
diff --git a/data/i18n/en/en.toml b/data/i18n/en/en.toml
index 1cf54e6a09..e6eb0feced 100644
--- a/data/i18n/en/en.toml
+++ b/data/i18n/en/en.toml
@@ -36,6 +36,9 @@ other = " documentation is no longer actively maintained. The version you are cu
 [deprecation_file_warning]
 other = "Deprecated"
 
+[dockershim_message]
+other = """The dockershim code required to run Docker Engine has been removed from the Kubernetes project as of release 1.24. Read the <a href="/dockershim">Dockershim Removal FAQ</a> for further details."""
+
 [docs_label_browse]
 other = "Browse Docs"
 
diff --git a/layouts/shortcodes/dockershim-removal.html b/layouts/shortcodes/dockershim-removal.html
new file mode 100644
index 0000000000..6ccd07f35e
--- /dev/null
+++ b/layouts/shortcodes/dockershim-removal.html
@@ -0,0 +1,3 @@
+<div class="alert alert-secondary callout note" role="alert">
+  <strong>{{ T "note" | safeHTML }}</strong> {{ T "dockershim_message" | safeHTML }}
+</div>

From ee36e095d921ef3aff7373478f7610d7a6ce3d1d Mon Sep 17 00:00:00 2001
From: Christopher Negus <striker57@gmail.com>
Date: Mon, 18 Apr 2022 22:58:03 +0000
Subject: [PATCH 2/2] Reworded dockershim message

---
 data/i18n/en/en.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/i18n/en/en.toml b/data/i18n/en/en.toml
index e6eb0feced..6c57982f9b 100644
--- a/data/i18n/en/en.toml
+++ b/data/i18n/en/en.toml
@@ -37,7 +37,7 @@ other = " documentation is no longer actively maintained. The version you are cu
 other = "Deprecated"
 
 [dockershim_message]
-other = """The dockershim code required to run Docker Engine has been removed from the Kubernetes project as of release 1.24. Read the <a href="/dockershim">Dockershim Removal FAQ</a> for further details."""
+other = """Dockershim has been removed from the Kubernetes project as of release 1.24. Read the <a href="/dockershim">Dockershim Removal FAQ</a> for further details."""
 
 [docs_label_browse]
 other = "Browse Docs"