Skip to content

[AKS] Set principalType when creating role assignments #33586

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

Open
FumingZhang wants to merge 1 commit into
base: dev
Choose a base branch
from
+12 −0
Open

[AKS] Set principalType when creating role assignments #33586

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
8 changes: 8 additions & 0 deletions src/azure-cli/azure/cli/command_modules/acs/_roleassignments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,14 @@ def add_role_assignment_executor(cmd, role, assignee, resource_group_name=None,

def add_role_assignment(cmd, role, service_principal_msi_id, is_service_principal=True,
delay=2, scope=None, assignee_principal_type=None):
# Every caller of add_role_assignment targets either a service principal or a managed
# identity, both of which are represented as a ServicePrincipal in Microsoft Entra ID.
# Explicitly setting the principal type lets the Authorization RP skip the Entra ID
# existence check, which avoids PrincipalNotFound failures caused by replication delay
# for freshly created identities.
if assignee_principal_type is None:
assignee_principal_type = "ServicePrincipal"

# AAD can have delays in propagating data, so sleep and retry
hook = cmd.cli_ctx.get_progress_controller(True)
hook.add(message="Waiting for AAD role to propagate", value=0, total_val=1.0)
Expand Down
4 changes: 4 additions & 0 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 @@ -8356,12 +8356,16 @@ def postprocessing_after_mc_created(self, cluster: ManagedCluster) -> None:
except Exception as e: # pylint: disable=broad-except
logger.warning("Could not get signed in user: %s", str(e))
else:
# signed_in_user_get() calls Graph /me, which only succeeds for a delegated
# (interactive) user; service principal / managed identity logins raise GraphError
# and are handled by the except branch above. So the assignee here is always a User.
self.context.external_functions.add_role_assignment_executor( # type: ignore # pylint: disable=protected-access
self.cmd,
"Azure Kubernetes Service RBAC Cluster Admin",
user["id"],
scope=cluster.id,
resolve_assignee=False,
assignee_principal_type="User",
)

def put_mc(self, mc: ManagedCluster) -> ManagedCluster:
Expand Down
Loading