Skip to content

Fix Arc machine RBAC for listBootstrapData #295

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
hbc (bcho) merged 4 commits into from
Sep 4, 2026
Merged

Fix Arc machine RBAC for listBootstrapData #295

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
628c0da
Initial plan
Copilot Aug 29, 2026
a075c17
Grant Arc machine identity full AKS RBAC roles matching MSI Flex Node
Copilot Aug 29, 2026
502cb8b
Add TODO for dedicated Arc machine RBAC role
Copilot Aug 30, 2026
85a90f7
Address Arc RBAC review feedback
Copilot Sep 3, 2026
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
33 changes: 27 additions & 6 deletions hack/e2e/lib/node-join-arc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@ set -euo pipefail
[[ -n "${_E2E_NODE_JOIN_ARC_LOADED:-}" ]] && return 0
readonly _E2E_NODE_JOIN_ARC_LOADED=1
readonly arcHybridComputeAPIVersion="2024-07-10"
# Same built-in roles granted to the MSI Flex Node in hack/e2e/infra/main.bicep (see
# roleClusterAdmin / roleAKSContributor / roleRbacAdmin). The Arc machine
# principal doesn't exist until after azcmagent connect, so it can't be
# pre-provisioned via bicep and these are assigned at runtime instead.
# TODO: replace these broad built-in roles with a single dedicated custom role
# scoped to only the permissions the Arc machine actually needs.
readonly aksClusterAdminRoleDefinitionID="0ab0b1a8-8aac-4efd-b8c2-3ee1fb270be8"
readonly aksContributorRoleDefinitionID="ed7f3fbd-7b88-4dd4-9017-9adb7ce333f8"
readonly aksRBACClusterAdminRoleDefinitionID="b1ff04bb-8a4e-4dc4-8eb5-8693973ce19b"

# shellcheck disable=SC1091
source "$(dirname "${BASH_SOURCE[0]}")/common.sh"
Expand Down Expand Up @@ -220,12 +228,25 @@ node_join_arc() {
state_set "arc_principal_id" "${principal_id}"

if [[ "$(state_get arc_role_assigned)" != "true" ]]; then
az role assignment create \
--assignee-object-id "${principal_id}" \
--assignee-principal-type ServicePrincipal \
--role "${aksContributorRoleDefinitionID}" \
--scope "${cluster_id}" \
--output none
local role_assignment_output role_definition_id
# Grant the Arc machine principal the same roles as the MSI Flex Node so
# it can call listBootstrapData and operate its AKS Machine resource.
for role_definition_id in \
"${aksClusterAdminRoleDefinitionID}" \
"${aksContributorRoleDefinitionID}" \
"${aksRBACClusterAdminRoleDefinitionID}"; do
if ! role_assignment_output="$(az role assignment create \
--assignee-object-id "${principal_id}" \
--assignee-principal-type ServicePrincipal \
--role "${role_definition_id}" \
--scope "${cluster_id}" \
--output none 2>&1)"; then
if [[ "${role_assignment_output}" != *"RoleAssignmentExists"* ]]; then
printf '%s\n' "${role_assignment_output}" >&2
return 1
fi
fi
done
state_set "arc_role_assigned" "true"
fi

Expand Down
Loading