Merge pull request #32826 from chrisnegus/dockershim-shortcode

k8s-ci-robot · web-flow · commit 22d86412bf72 · 2022-04-18T16:09:50.000-07:00
Create dockershim shortcode
diff --git 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
@@ -36,6 +36,9 @@ other = " documentation is no longer actively maintained. The version you are cu
 [deprecation_file_warning]
 other = "Deprecated"
 
+[dockershim_message]
+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"
 
diff --git a/layouts/shortcodes/dockershim-removal.html 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>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<div class="alert alert-secondary callout note" role="alert">`
	`2`	`+ <strong>{{ T "note" \| safeHTML }}</strong> {{ T "dockershim_message" \| safeHTML }}`
	`3`	`+</div>`