Skip to content

[AKS] Fix cross-sub assigning identity error and attach acr error #17281

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
fengzhou-msft merged 4 commits into from
Mar 16, 2021
+15 −7
Merged

[AKS] Fix cross-sub assigning identity error and attach acr error #17281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2a9e51
Fix cross-sub assigning identity error and attach acr error
norshtein Mar 11, 2021
1ec35f3
Fix lint
norshtein Mar 11, 2021
ec51cf7
Fix lint
norshtein Mar 11, 2021
48f1956
Fix lint
norshtein Mar 11, 2021
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: 3 additions & 2 deletions src/azure-cli/azure/cli/command_modules/acs/_client_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,5 +116,6 @@ def get_resource_by_name(cli_ctx, resource_name, resource_type):
resource_type, resource_name))


def get_msi_client(cli_ctx, **_):
return get_mgmt_service_client(cli_ctx, ManagedServiceIdentityClient)
def get_msi_client(cli_ctx, subscription_id=None):
return get_mgmt_service_client(cli_ctx, ManagedServiceIdentityClient,
subscription_id=subscription_id)
17 changes: 12 additions & 5 deletions 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 @@ -772,13 +772,14 @@ def _generate_properties(api_version, orchestrator_type, orchestrator_version, m


def _get_user_assigned_identity_client_id(cli_ctx, resource_id):
msi_client = get_msi_client(cli_ctx)
pattern = '/subscriptions/.*?/resourcegroups/(.*?)/providers/microsoft.managedidentity/userassignedidentities/(.*)'
pattern = '/subscriptions/(.*?)/resourcegroups/(.*?)/providers/microsoft.managedidentity/userassignedidentities/(.*)' # pylint: disable=line-too-long
resource_id = resource_id.lower()
match = re.search(pattern, resource_id)
if match:
resource_group_name = match.group(1)
identity_name = match.group(2)
subscription_id = match.group(1)
resource_group_name = match.group(2)
identity_name = match.group(3)
msi_client = get_msi_client(cli_ctx, subscription_id)
try:
identity = msi_client.user_assigned_identities.get(resource_group_name=resource_group_name,
resource_name=identity_name)
Expand Down Expand Up @@ -2546,7 +2547,7 @@ def aks_update(cmd, client, resource_group_name, name,
subscription_id = get_subscription_id(cmd.cli_ctx)

client_id = ""
if instance.identity is not None and instance.identity.type == "SystemAssigned":
if _is_msi_cluster(instance):
if instance.identity_profile is None or instance.identity_profile["kubeletidentity"] is None:
raise CLIError('Unexpected error getting kubelet\'s identity for the cluster. '
'Please do not set --attach-acr or --detach-acr. '
Expand Down Expand Up @@ -4068,3 +4069,9 @@ def openshift_monitor_disable(cmd, client, resource_group_name, name, no_wait=Fa
monitor_profile = OpenShiftManagedClusterMonitorProfile(enabled=False, workspace_resource_id=None) # pylint: disable=line-too-long
instance.monitor_profile = monitor_profile
return sdk_no_wait(no_wait, client.create_or_update, resource_group_name, name, instance)


def _is_msi_cluster(managed_cluster):
return (managed_cluster and managed_cluster.identity and
(managed_cluster.identity.type.casefold() == "systemassigned" or
managed_cluster.identity.type.casefold() == "userassigned"))