From 7d5058b3a5ce9d1dc979053f7c82f8dc72ce42c4 Mon Sep 17 00:00:00 2001 From: Zoey Li Date: Mon, 29 Sep 2025 22:21:26 -0400 Subject: [PATCH 1/2] [ACR] Add breaking change announcement for acr content-trust related commands --- .../command_modules/acr/_breaking_change.py | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/azure-cli/azure/cli/command_modules/acr/_breaking_change.py b/src/azure-cli/azure/cli/command_modules/acr/_breaking_change.py index 5f734617448..de98a89bdc6 100644 --- a/src/azure-cli/azure/cli/command_modules/acr/_breaking_change.py +++ b/src/azure-cli/azure/cli/command_modules/acr/_breaking_change.py @@ -3,7 +3,10 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from azure.cli.core.breaking_change import register_command_group_deprecate +from azure.cli.core.breaking_change import ( + register_command_group_deprecate, + register_logic_breaking_change +) helm_bc_msg = 'In November 2020, Helm 2 reached end of life. ' \ 'Starting on March 30th, 2025 Azure Container Registry will no longer support Helm 2. ' \ @@ -20,5 +23,21 @@ 'then it is stored in a legacy Helm repository and is at risk of deletion.\n' \ 'For more information on managing and deploying applications for Kubernetes, ' \ 'see https://aka.ms/acr/helm.' + +content_trust_bc_msg = 'Content Trust is being deprecated and will be completely removed on March 31, 2028. ' \ + 'Refer to https://aka.ms/acr/dctdeprecation for details and transition guidance' + register_command_group_deprecate(command_group='acr helm', redirect='Helm v3 commands', message=helm_bc_msg, target_version='Sept 30th, 2025') + +register_command_group_deprecate(command_group='acr config content-trust', message=content_trust_bc_msg) + +register_logic_breaking_change('acr check-health', 'Remove Notary client version validation', + detail='The Notary client version check will no longer be performed as part of the ' + 'check-health command due to Docker Content Trust deprecation.', + doc_link='https://aka.ms/acr/dctdeprecation') + +register_logic_breaking_change('acr config content-trust update', 'Remove content-trust enabled configuration', + detail='The `--status enabled` parameter will no longer be accepted and will result in ' + 'an error due to Docker Content Trust deprecation.', + doc_link='https://aka.ms/acr/dctdeprecation') From 68c99f167e169fdb8196a013e4a60bc4e8db2a8e Mon Sep 17 00:00:00 2001 From: Zoey Li Date: Mon, 6 Oct 2025 22:41:16 -0400 Subject: [PATCH 2/2] Remove the breaking changes announcement; it will be included in a separate PR --- .../cli/command_modules/acr/_breaking_change.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/acr/_breaking_change.py b/src/azure-cli/azure/cli/command_modules/acr/_breaking_change.py index de98a89bdc6..f19446cbbfe 100644 --- a/src/azure-cli/azure/cli/command_modules/acr/_breaking_change.py +++ b/src/azure-cli/azure/cli/command_modules/acr/_breaking_change.py @@ -3,10 +3,7 @@ # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- -from azure.cli.core.breaking_change import ( - register_command_group_deprecate, - register_logic_breaking_change -) +from azure.cli.core.breaking_change import register_command_group_deprecate helm_bc_msg = 'In November 2020, Helm 2 reached end of life. ' \ 'Starting on March 30th, 2025 Azure Container Registry will no longer support Helm 2. ' \ @@ -31,13 +28,3 @@ target_version='Sept 30th, 2025') register_command_group_deprecate(command_group='acr config content-trust', message=content_trust_bc_msg) - -register_logic_breaking_change('acr check-health', 'Remove Notary client version validation', - detail='The Notary client version check will no longer be performed as part of the ' - 'check-health command due to Docker Content Trust deprecation.', - doc_link='https://aka.ms/acr/dctdeprecation') - -register_logic_breaking_change('acr config content-trust update', 'Remove content-trust enabled configuration', - detail='The `--status enabled` parameter will no longer be accepted and will result in ' - 'an error due to Docker Content Trust deprecation.', - doc_link='https://aka.ms/acr/dctdeprecation')