From b897db43ee51f6862ef5d61c61807a7bffd6600f Mon Sep 17 00:00:00 2001
From: Mikhail Mazurskiy <mmazurskiy@gitlab.com>
Date: Mon, 3 Mar 2025 14:56:36 +0000
Subject: [PATCH] Update deprecation notice for agentk image move

---
 data/deprecations/17-9-move-agentk-to-cng.yml | 15 +++++++++++----
 doc/update/deprecations.md                    | 17 ++++++++++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/data/deprecations/17-9-move-agentk-to-cng.yml b/data/deprecations/17-9-move-agentk-to-cng.yml
index 615b3e1bd0dac..552805d665c0e 100644
--- a/data/deprecations/17-9-move-agentk-to-cng.yml
+++ b/data/deprecations/17-9-move-agentk-to-cng.yml
@@ -11,8 +11,15 @@
   resolution_role: Admin
   manual_task: true
   body: |  # (required) Don't change this line.
-    We are moving the `agentk` container registry from [its project-specific registry](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/container_registry/1223205) to [the Cloud Native GitLab registry](https://gitlab.com/gitlab-org/build/CNG/container_registry/8241772).
-    From GitLab 18.0, the project-specific registry will not receive `agentk` updates.
-    If you mirror the `agentk` container to a local registry, you should change your mirror source to the CNG registry.
+    We are moving the `agentk` container registry from
+    [its project-specific registry](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/container_registry/1223205)
+    to [the Cloud Native GitLab (CNG) registry](https://gitlab.com/gitlab-org/build/CNG/container_registry/8241772).
+    From GitLab 18.0 onward, `agentk` images built in CNG will mirror into the project-specific registry.
+    The new image is equivalent to the old image, except the new image only supports `amd64` and `arm64` architectures.
+    It does not support the 32-bit `arm` architecture.
+    From GitLab 19.0 onward, the project-specific registry will not receive `agentk` updates.
+    If you mirror the `agentk` container to a local registry, you should change your mirror source to the
+    [CNG registry](https://gitlab.com/gitlab-org/build/CNG/container_registry/8241772).
 
-    If you use the official Helm charts, they will start deploying from the new location seamlessly.
+    If you use the official [GitLab Agent Helm chart](https://gitlab.com/gitlab-org/charts/gitlab-agent/),
+    the new `agentk` image will start deploying from the new location seamlessly in GitLab 18.0.
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index a867696489c7c..d47f03bafcce9 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -2003,11 +2003,18 @@ We will be transitioning to a new IID as a result of moving requirements to a [w
 
 </div>
 
-We are moving the `agentk` container registry from [its project-specific registry](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/container_registry/1223205) to [the Cloud Native GitLab registry](https://gitlab.com/gitlab-org/build/CNG/container_registry/8241772).
-From GitLab 18.0, the project-specific registry will not receive `agentk` updates.
-If you mirror the `agentk` container to a local registry, you should change your mirror source to the CNG registry.
-
-If you use the official Helm charts, they will start deploying from the new location seamlessly.
+We are moving the `agentk` container registry from
+[its project-specific registry](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/container_registry/1223205)
+to [the Cloud Native GitLab (CNG) registry](https://gitlab.com/gitlab-org/build/CNG/container_registry/8241772).
+From GitLab 18.0 onward, `agentk` images built in CNG will mirror into the project-specific registry.
+The new image is equivalent to the old image, except the new image only supports `amd64` and `arm64` architectures.
+It does not support the 32-bit `arm` architecture.
+From GitLab 19.0 onward, the project-specific registry will not receive `agentk` updates.
+If you mirror the `agentk` container to a local registry, you should change your mirror source to the
+[CNG registry](https://gitlab.com/gitlab-org/build/CNG/container_registry/8241772).
+
+If you use the official [GitLab Agent Helm chart](https://gitlab.com/gitlab-org/charts/gitlab-agent/),
+the new `agentk` image will start deploying from the new location seamlessly in GitLab 18.0.
 
 </div>
 
-- 
GitLab