Skip to content

Commit 9f5b552

Browse files
authored
Fix ASM egress disable help message (#8658)
* Fix ASM egress disable help message Signed-off-by: nshankar <nshankar@microsoft.com> * Update version Signed-off-by: nshankar <nshankar@microsoft.com> * Throw error for no-op egress enablement Signed-off-by: nshankar <nshankar@microsoft.com> * Fix lint Signed-off-by: nshankar <nshankar@microsoft.com> * Update indentation Signed-off-by: nshankar <nshankar@microsoft.com> * update indentation Signed-off-by: nshankar <nshankar@microsoft.com> --------- Signed-off-by: nshankar <nshankar@microsoft.com>
1 parent 4fed0d1 commit 9f5b552

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

src/aks-preview/HISTORY.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ To release a new version, please select a new version number (usually plus 1 to
1111

1212
Pending
1313
+++++++
14+
15+
16+
14.0.0b2
17+
+++++++
18+
* Update the `disable-egress-gateway` subcommand to fix `--help` output for the `az aks mesh` command.
1419
* Vendor new SDK and bump API version to 2025-01-02-preview.
1520
* Modify behavior for `--nodepool-initialization-taints` to ignore taints with hard effects on node pools with system mode when creating or updating a cluster.
1621

src/aks-preview/azext_aks_preview/_help.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3106,7 +3106,7 @@
31063106

31073107
helps['aks mesh disable-egress-gateway'] = """
31083108
type: command
3109-
short-summary: Disable an Azure Service Mesh ingress gateway.
3109+
short-summary: Disable an Azure Service Mesh egress gateway.
31103110
long-summary: This command disables an Azure Service Mesh egress gateway in given cluster.
31113111
parameters:
31123112
- name: --istio-eg-gtw-name --istio-egressgateway-name

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2402,6 +2402,13 @@ def _handle_egress_gateways_asm(self, new_profile: ServiceMeshProfile) -> Tuple[
24022402
f'Egress gateway {istio_egressgateway_name} '
24032403
f'in namespace {istio_egressgateway_namespace} is already disabled.'
24042404
)
2405+
if egress.enabled and enable_egress_gateway:
2406+
if egress.gateway_configuration_name == gateway_configuration_name:
2407+
raise ArgumentUsageError(
2408+
f'Egress gateway {istio_egressgateway_name} '
2409+
f'in namespace {istio_egressgateway_namespace} is already enabled '
2410+
f'with gateway configuration name {gateway_configuration_name}.'
2411+
)
24052412
egress.enabled = enable_egress_gateway
24062413
# only update gateway configuration name for enabled egress gateways
24072414
if enable_egress_gateway:

src/aks-preview/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from setuptools import setup, find_packages
1111

12-
VERSION = "14.0.0b1"
12+
VERSION = "14.0.0b2"
1313

1414
CLASSIFIERS = [
1515
"Development Status :: 4 - Beta",

0 commit comments

Comments
 (0)