Merge branch 'dev' of https://github.com/Azure/azure-cli into add-tag-for-public-ip

Author: yanzhudd

.github/policies/resourceManagement.yml

@@ -231,7 +231,7 @@ configuration:
         then:
         - mentionUsers:
             mentionees:
-            - mbifeld
+            - dyu1208
             - FumingZhang
             - andyliuliming
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.

src/azure-cli/azure/cli/command_modules/acr/_breaking_change.py

@@ -3,7 +3,25 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-from azure.cli.core.breaking_change import register_output_breaking_change
+from azure.cli.core.breaking_change import register_output_breaking_change, register_command_group_deprecate
 
 register_output_breaking_change(command_name='acr login',
                                 description='Exit code will be 1 if command fails for docker login')
+
+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. ' \
+              'Therefore, the legacy "Helm repositories" functionality will also be retired. ' \
+              'We recommend that you transition to Helm 3 immediately.\n' \
+              'Starting January 21st, 2025 the CLI command `az acr helm push` was retired to ' \
+              'prevent pushing new Helm charts to legacy Helm repositories.\n' \
+              'Starting March 30th, 2025 the CLI command group `az acr helm` was retired, ' \
+              'ending all legacy Helm repository capabilities in Azure Container Registry.\n' \
+              'All Helm charts not stored as an OCI artifact ' \
+              'was deleted from Azure Container Registry on March 30th, 2025.\n' \
+              'Learn how to find all Helm charts stored in a Helm repository here: `az acr helm list`. ' \
+              'If the Helm chart you are using is listed ' \
+              '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.'
+register_command_group_deprecate(command_group='acr helm', redirect='Helm v3 commands', message=helm_bc_msg,
+                                 target_version='Sept 30th, 2025')

src/azure-cli/azure/cli/command_modules/acr/commands.py

@@ -360,24 +360,13 @@ def load_command_table(self, _):
         g.show_command('show', 'acr_config_authentication_as_arm_show')
         g.command('update', 'acr_config_authentication_as_arm_update')
 
-    def _helm_deprecate_message(self):
-        msg = "This {} has been deprecated and will be removed in future release.".format(self.object_type)
-        msg += " Use '{}' instead.".format(self.redirect)
-        msg += " Learn more about storing Helm charts at"
-        msg += " https://aka.ms/acr/helm"
-        return msg
-
-    helm_deprecate_info = self.deprecate(redirect="Helm v3 commands", message_func=_helm_deprecate_message)
-
-    with self.command_group('acr helm', acr_helm_util, deprecate_info=helm_deprecate_info) as g:
-        g.command('list', 'acr_helm_list', table_transformer=helm_list_output_format,
-                  deprecate_info=helm_deprecate_info)
-        g.show_command('show', 'acr_helm_show', table_transformer=helm_show_output_format,
-                       deprecate_info=helm_deprecate_info)
-        g.command('delete', 'acr_helm_delete', deprecate_info=helm_deprecate_info)
-        g.command('push', 'acr_helm_push', deprecate_info=helm_deprecate_info)
-        g.command('repo add', 'acr_helm_repo_add', deprecate_info=helm_deprecate_info)
-        g.command('install-cli', 'acr_helm_install_cli', is_preview=True, deprecate_info=helm_deprecate_info)
+    with self.command_group('acr helm', acr_helm_util) as g:
+        g.command('list', 'acr_helm_list', table_transformer=helm_list_output_format)
+        g.show_command('show', 'acr_helm_show', table_transformer=helm_show_output_format)
+        g.command('delete', 'acr_helm_delete')
+        g.command('push', 'acr_helm_push')
+        g.command('repo add', 'acr_helm_repo_add')
+        g.command('install-cli', 'acr_helm_install_cli', is_preview=True)
 
     with self.command_group('acr network-rule', acr_network_rule_util) as g:
         g.command('list', 'acr_network_rule_list')

…les/acr/tests/latest/taskfilesample.yaml …cr/tests/latest/data/taskfilesample.yamlsrc/azure-cli/azure/cli/command_modules/acr/tests/latest/taskfilesample.yaml renamed to src/azure-cli/azure/cli/command_modules/acr/tests/latest/data/taskfilesample.yaml src/azure-cli/azure/cli/command_modules/acr/tests/latest/taskfilesample.yaml renamed to src/azure-cli/azure/cli/command_modules/acr/tests/latest/data/taskfilesample.yaml

@@ -28,7 +28,7 @@ def test_acr_task(self, resource_group):
             'trigger_enabled': 'False',
             'identity': '[system]',
             'loginServer': 'test.acr.com',
-            'file_path': os.path.join(curr_dir, 'taskfilesample.yaml').replace('\\', '\\\\')
+            'file_path': os.path.join(curr_dir, 'data//taskfilesample.yaml').replace('\\', '\\\\')
         })
         self.cmd('acr create -n {registry_name} -g {rg} -l {rg_loc} --sku {sku}',
                  checks=[self.check('name', '{registry_name}'),

src/azure-cli/azure/cli/command_modules/acr/tests/latest/recordings/test_acr_task.yaml

@@ -53,6 +53,10 @@
 CONST_GPU_INSTANCE_PROFILE_MIG4_G = "MIG4g"
 CONST_GPU_INSTANCE_PROFILE_MIG7_G = "MIG7g"
 
+# gpu driver install
+CONST_GPU_DRIVER_INSTALL = "Install"
+CONST_GPU_DRIVER_NONE = "None"
+
 # consts for ManagedCluster
 # load balancer sku
 CONST_LOAD_BALANCER_SKU_BASIC = "basic"

src/azure-cli/azure/cli/command_modules/acr/tests/latest/test_acr_task_commands.py

@@ -435,6 +435,10 @@
   - name: --k8s-support-plan
     type: string
     short-summary: Choose from "KubernetesOfficial" or "AKSLongTermSupport", with "AKSLongTermSupport" you get 1 extra year of CVE patchs.
+  - name: --ca-certs --custom-ca-trust-certificates
+    type: string
+    short-summary: Path to a file containing up to 10 blank line separated certificates. Only valid for Linux nodes.
+    long-summary: These certificates are used by Custom CA Trust feature and will be added to trust stores of nodes.
   - name: --enable-defender
     type: bool
     short-summary: Enable Microsoft Defender security profile.
@@ -865,6 +869,10 @@
   - name: --disable-defender
     type: bool
     short-summary: Disable defender profile.
+  - name: --ca-certs --custom-ca-trust-certificates
+    type: string
+    short-summary: Path to a file containing up to 10 blank line separated certificates. Only valid for Linux nodes.
+    long-summary: These certificates are used by Custom CA Trust feature and will be added to trust stores of nodes.
   - name: --defender-config
     type: string
     short-summary: Path to JSON file containing Microsoft Defender profile configurations.
@@ -1663,6 +1671,9 @@
   - name: --if-none-match
     type: string
     short-summary: Set to '*' to allow a new agentpool to be created, but to prevent updating an existing agentpool. Other values will be ignored.
+  - name: --gpu-driver
+    type: string
+    short-summary: Whether to install driver for GPU node pool. Possible values are "Install" or "None". Default is "Install".
 
 examples:
   - name: Create a nodepool in an existing AKS cluster with ephemeral os enabled.

src/azure-cli/azure/cli/command_modules/acs/_consts.py

@@ -16,6 +16,7 @@
     CONST_GPU_INSTANCE_PROFILE_MIG1_G, CONST_GPU_INSTANCE_PROFILE_MIG2_G,
     CONST_GPU_INSTANCE_PROFILE_MIG3_G, CONST_GPU_INSTANCE_PROFILE_MIG4_G,
     CONST_GPU_INSTANCE_PROFILE_MIG7_G, CONST_LOAD_BALANCER_SKU_BASIC,
+    CONST_GPU_DRIVER_INSTALL, CONST_GPU_DRIVER_NONE,
     CONST_LOAD_BALANCER_SKU_STANDARD, CONST_MANAGED_CLUSTER_SKU_TIER_FREE,
     CONST_MANAGED_CLUSTER_SKU_TIER_STANDARD, CONST_MANAGED_CLUSTER_SKU_TIER_PREMIUM,
     CONST_NETWORK_DATAPLANE_AZURE, CONST_NETWORK_DATAPLANE_CILIUM,
@@ -104,6 +105,7 @@
     validate_crg_id,
     validate_azure_service_mesh_revision,
     validate_message_of_the_day,
+    validate_custom_ca_trust_certificates,
     validate_bootstrap_container_registry_resource_id)
 from azure.cli.core.commands.parameters import (
     edge_zone_type, file_type, get_enum_type,
@@ -193,6 +195,11 @@
     CONST_GPU_INSTANCE_PROFILE_MIG7_G,
 ]
 
+gpu_driver_install_modes = [
+    CONST_GPU_DRIVER_INSTALL,
+    CONST_GPU_DRIVER_NONE
+]
+
 nrg_lockdown_restriction_levels = [
     CONST_NRG_LOCKDOWN_RESTRICTION_LEVEL_READONLY,
     CONST_NRG_LOCKDOWN_RESTRICTION_LEVEL_UNRESTRICTED,
@@ -375,6 +382,7 @@ def load_arguments(self, _):
         c.argument('enable_image_cleaner', action='store_true')
         c.argument('image_cleaner_interval_hours', type=int)
         c.argument('http_proxy_config')
+        c.argument('custom_ca_trust_certificates', options_list=["--custom-ca-trust-certificates", "--ca-certs"], help="path to file containing list of new line separated CAs")
         c.argument('enable_keda', action='store_true')
         c.argument('enable_vpa', action='store_true', help='enable vertical pod autoscaler for cluster')
         c.argument('enable_azure_service_mesh',
@@ -574,6 +582,7 @@ def load_arguments(self, _):
         c.argument('disable_image_cleaner', action='store_true', validator=validate_image_cleaner_enable_disable_mutually_exclusive)
         c.argument('image_cleaner_interval_hours', type=int)
         c.argument('http_proxy_config')
+        c.argument('custom_ca_trust_certificates', options_list=["--custom-ca-trust-certificates", "--ca-certs"], validator=validate_custom_ca_trust_certificates, help="path to file containing list of new line separated CAs")
         c.argument('enable_keda', action='store_true')
         c.argument('disable_keda', action='store_true')
         c.argument('enable_vpa', action='store_true', help='enable vertical pod autoscaler for cluster')
@@ -825,6 +834,7 @@ def load_arguments(self, _):
         c.argument('enable_secure_boot', action='store_true')
         c.argument("if_match")
         c.argument("if_none_match")
+        c.argument('gpu_driver', arg_type=get_enum_type(gpu_driver_install_modes))
 
     with self.argument_context('aks nodepool update', resource_type=ResourceType.MGMT_CONTAINERSERVICE, operation_group='agent_pools') as c:
         c.argument('enable_cluster_autoscaler', options_list=[

src/azure-cli/azure/cli/command_modules/acs/_help.py

@@ -844,3 +844,11 @@ def validate_bootstrap_container_registry_resource_id(namespace):
     from msrestazure.tools import is_valid_resource_id
     if not is_valid_resource_id(container_registry_resource_id):
         raise InvalidArgumentValueError("--bootstrap-container-registry-resource-id is not a valid Azure resource ID.")
+
+
+def validate_custom_ca_trust_certificates(namespace):
+    """Validates Custom CA Trust Certificates can only be used on Linux."""
+    if namespace.custom_ca_trust_certificates is not None and namespace.custom_ca_trust_certificates != "":
+        if hasattr(namespace, 'os_type') and namespace.os_type != "Linux":
+            raise ArgumentUsageError(
+                '--custom-ca-trust-certificates can only be set for linux nodepools')