Skip to content
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

Jump to bottom

[AKS] BREAKING CHANGE: az aks create: Updates to option --enable-managed-identity #28906

Merged
merged 1 commit into from
May 8, 2024
Merged

[AKS] BREAKING CHANGE: az aks create: Updates to option --enable-managed-identity #28906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/azure-cli/azure/cli/command_modules/acs/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ def aks_create(
disable_public_fqdn=False,
service_principal=None,
client_secret=None,
enable_managed_identity=True,
enable_managed_identity=False,
assign_identity=None,
assign_kubelet_identity=None,
enable_aad=False,
Expand Down
17 changes: 13 additions & 4 deletions src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,27 +1610,36 @@ def _get_enable_managed_identity(
# read the original value passed by the command
enable_managed_identity = self.raw_param.get("enable_managed_identity")
# In create mode, try to read the property value corresponding to the parameter from the `mc` object
read_from_mc = False
if self.decorator_mode == DecoratorMode.CREATE:
if self.mc and self.mc.identity:
enable_managed_identity = check_is_msi_cluster(self.mc)
read_from_mc = True

# skip dynamic completion & validation if option read_only is specified
if read_only:
return enable_managed_identity

# dynamic completion for create mode only
if self.decorator_mode == DecoratorMode.CREATE:
# if user does not specify service principal or client secret,
# backfill the value of enable_managed_identity to True
(
service_principal,
client_secret,
) = self._get_service_principal_and_client_secret(read_only=True)
if not read_from_mc and service_principal and client_secret:
enable_managed_identity = False
if not (service_principal or client_secret) and not enable_managed_identity:
enable_managed_identity = True

# validation
if enable_validation:
if self.decorator_mode == DecoratorMode.CREATE:
(
service_principal,
client_secret,
) = self._get_service_principal_and_client_secret(read_only=True)
if (service_principal or client_secret) and enable_managed_identity:
raise MutuallyExclusiveArgumentError(
"Cannot specify --enable-managed-identity and --service-principal/--client-secret at same time"
)
if not enable_managed_identity and self._get_assign_identity(enable_validation=False):
raise RequiredArgumentMissingError(
"--assign-identity can only be specified when --enable-managed-identity is specified"
Expand Down
Loading