diff --git a/src/aks-preview/HISTORY.rst b/src/aks-preview/HISTORY.rst index f1bc2a710db..dfd48d844e1 100644 --- a/src/aks-preview/HISTORY.rst +++ b/src/aks-preview/HISTORY.rst @@ -11,6 +11,11 @@ To release a new version, please select a new version number (usually plus 1 to Pending +++++++ + + +14.0.0b2 ++++++++ +* Update the `disable-egress-gateway` subcommand to fix `--help` output for the `az aks mesh` command. * Vendor new SDK and bump API version to 2025-01-02-preview. * Modify behavior for `--nodepool-initialization-taints` to ignore taints with hard effects on node pools with system mode when creating or updating a cluster. diff --git a/src/aks-preview/azext_aks_preview/_help.py b/src/aks-preview/azext_aks_preview/_help.py index 0588cc1c269..e08fe641ba5 100644 --- a/src/aks-preview/azext_aks_preview/_help.py +++ b/src/aks-preview/azext_aks_preview/_help.py @@ -3106,7 +3106,7 @@ helps['aks mesh disable-egress-gateway'] = """ type: command - short-summary: Disable an Azure Service Mesh ingress gateway. + short-summary: Disable an Azure Service Mesh egress gateway. long-summary: This command disables an Azure Service Mesh egress gateway in given cluster. parameters: - name: --istio-eg-gtw-name --istio-egressgateway-name diff --git a/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py b/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py index 11ff76a5322..629b288465a 100644 --- a/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py +++ b/src/aks-preview/azext_aks_preview/managed_cluster_decorator.py @@ -2402,6 +2402,13 @@ def _handle_egress_gateways_asm(self, new_profile: ServiceMeshProfile) -> Tuple[ f'Egress gateway {istio_egressgateway_name} ' f'in namespace {istio_egressgateway_namespace} is already disabled.' ) + if egress.enabled and enable_egress_gateway: + if egress.gateway_configuration_name == gateway_configuration_name: + raise ArgumentUsageError( + f'Egress gateway {istio_egressgateway_name} ' + f'in namespace {istio_egressgateway_namespace} is already enabled ' + f'with gateway configuration name {gateway_configuration_name}.' + ) egress.enabled = enable_egress_gateway # only update gateway configuration name for enabled egress gateways if enable_egress_gateway: diff --git a/src/aks-preview/setup.py b/src/aks-preview/setup.py index 10568727a78..55ee207ed60 100644 --- a/src/aks-preview/setup.py +++ b/src/aks-preview/setup.py @@ -9,7 +9,7 @@ from setuptools import setup, find_packages -VERSION = "14.0.0b1" +VERSION = "14.0.0b2" CLASSIFIERS = [ "Development Status :: 4 - Beta",