Skip to content

Fix ASM egress disable help message #8658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 6 commits into from
Apr 21, 2025
Merged

Fix ASM egress disable help message #8658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a5d3a76
Fix ASM egress disable help message
nshankar13 Apr 14, 2025
50528d5
Update version
nshankar13 Apr 14, 2025
6b61530
Throw error for no-op egress enablement
nshankar13 Apr 18, 2025
1c2f06c
Fix lint
nshankar13 Apr 18, 2025
da2167c
Update indentation
nshankar13 Apr 18, 2025
bb8e4ba
update indentation
nshankar13 Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/aks-preview/HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion src/aks-preview/azext_aks_preview/_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions src/aks-preview/azext_aks_preview/managed_cluster_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/aks-preview/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from setuptools import setup, find_packages

VERSION = "14.0.0b1"
VERSION = "14.0.0b2"

CLASSIFIERS = [
"Development Status :: 4 - Beta",
Expand Down
Loading