Update upgrade guides to clarify that legacy repos are frozen (#43472)

* Add legacy-repos-deprecation shortcode and localization Signed-off-by: Marko Mudrinić <[email protected]> * Update install/upgrade guides to clarify that legacy repos are frozen Signed-off-by: Marko Mudrinić <[email protected]> * Update the legacy repos message Signed-off-by: Marko Mudrinić <[email protected]> --------- Signed-off-by: Marko Mudrinić <[email protected]>
kubernetes · Oct 17, 2023 · e4a2ab2 · e4a2ab2
1 parent 2157373
commit e4a2ab2
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 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
@@ -157,19 +157,12 @@ For more information on version skews, see:
 * Kubernetes [version and version-skew policy](/docs/setup/release/version-skew-policy/)
 * Kubeadm-specific [version skew policy](/docs/setup/production-environment/tools/kubeadm/create-cluster-kubeadm/#version-skew-policy)
 
-{{< note >}}
-Kubernetes has [new package repositories hosted at `pkgs.k8s.io`](/blog/2023/08/15/pkgs-k8s-io-introduction/)
-starting from August 2023. The legacy package repositories (`apt.kubernetes.io` and `yum.kubernetes.io`)
-have been frozen starting from September 13, 2023. Please read our
-[deprecation and freezing announcement](/blog/2023/08/31/legacy-package-repository-deprecation/)
-for more details.
-{{< /note >}}
+{{% legacy-repos-deprecation %}}
 
 {{< note >}}
 There's a dedicated package repository for each Kubernetes minor version. If you want to install
 a minor version other than {{< skew currentVersion >}}, please see the installation guide for
-your desired minor version. The official Kubernetes package repositories provide downloads for
-Kubernetes versions starting with v1.24.0. 
+your desired minor version.
 {{< /note >}}
 
 {{< tabs name="k8s_install" >}}

diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/change-package-repository.md b/content/en/docs/tasks/administer-cluster/kubeadm/change-package-repository.md
@@ -19,6 +19,8 @@ package repositories (`pkgs.k8s.io`). If that's not the case, it's strongly
 recommended to migrate to the community-owned package repositories as described
 in the [official announcement](/blog/2023/08/15/pkgs-k8s-io-introduction/).
 
+{{% legacy-repos-deprecation %}}
+
 ### Verifying if the Kubernetes package repositories are used
 
 If you're unsure whether you're using the community-owned package repositories or the

diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md b/content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade.md
@@ -59,6 +59,8 @@ enable the package repository for the desired Kubernetes minor release. This is
 [Changing the Kubernetes package repository](/docs/tasks/administer-cluster/kubeadm/change-package-repository/)
 document.
 
+{{% legacy-repos-deprecation %}}
+
 ## Determine which version to upgrade to
 
 Find the latest patch release for Kubernetes {{< skew currentVersion >}} using the OS package manager:

diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/upgrading-linux-nodes.md b/content/en/docs/tasks/administer-cluster/kubeadm/upgrading-linux-nodes.md
@@ -24,6 +24,8 @@ enable the package repository for the desired Kubernetes minor release. This is
 [Changing the Kubernetes package repository](/docs/tasks/administer-cluster/kubeadm/change-package-repository/)
 document.
 
+{{% legacy-repos-deprecation %}}
+
 ## Upgrading worker nodes
 
 ### Upgrade kubeadm

diff --git a/data/i18n/en/en.toml b/data/i18n/en/en.toml
@@ -282,6 +282,14 @@ other = "Thanks for the feedback. If you have a specific, answerable question ab
 [layouts_docs_search_fetching]
 other = "Fetching results..."
 
+[legacy_repos_message]
+other = """The legacy package repositories (`apt.kubernetes.io` and `yum.kubernetes.io`) have been
+[deprecated and frozen starting from September 13, 2023](/blog/2023/08/31/legacy-package-repository-deprecation/).
+**Using the [new package repositories hosted at `pkgs.k8s.io`](/blog/2023/08/15/pkgs-k8s-io-introduction/)
+is strongly recommended and required in order to install Kubernetes versions released after September 13, 2023.**
+The deprecated legacy repositories, and their contents, might be removed at any time in the future and without
+a further notice period. The new package repositories provide downloads for Kubernetes versions starting with v1.24.0."""
+
 [main_by]
 other = "by"
 

diff --git a/layouts/shortcodes/legacy-repos-deprecation.html b/layouts/shortcodes/legacy-repos-deprecation.html
@@ -0,0 +1,3 @@
+<div class="alert alert-secondary callout note" role="alert">
+  <strong>{{ T "note" | safeHTML }}</strong> {{ T "legacy_repos_message" | markdownify }}
+</div>