Skip to content

feat: add KeyVaultCryptoOfficer assignment to CI bot #6014

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

Closed
ahitacat wants to merge 1 commit into from
+20 −0
Closed

feat: add KeyVaultCryptoOfficer assignment to CI bot #6014

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 dev-infrastructure/openshift-ci/grant-openshift-release-bot-dev.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ for SUBSCRIPTION_NAME in "${SUBSCRIPTIONS[@]}"; do
if [[ "${SUBSCRIPTION_NAME}" == "${GLOBAL_SUBSCRIPTION_NAME}" ]]; then
GLOBAL_SUBSCRIPTION_ID="${SUBSCRIPTION_ID}"
fi

# Assign Key Vault Crypto Officer for calling Key Vault data plane directly
# Used for create/enable/update/delete keys
echo " Assigning Key Vault Crypto Officer role..."
az role assignment create \
--assignee "${APP_ID}" \
--role "Key Vault Crypto Officer" \
--scope "/subscriptions/${SUBSCRIPTION_ID}" 2>/dev/null || echo " (already assigned)"
Comment on lines +153 to +157

@roivaz roivaz Jul 13, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahitacat worth addressing

done

if [[ -z "${GLOBAL_SUBSCRIPTION_ID:-}" ]]; then
Expand Down
12 changes: 12 additions & 0 deletions dev-infrastructure/templates/ci-bot-rbac-subscription.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ var userAccessAdminRole = '18d7d88d-d35e-4fb5-a5c3-7773c20a72d9'
var keyVaultAdminRole = '00482a5a-887f-4fb3-b363-3b7fe8e74483'
var grafanaAdminRole = '22926164-76b3-42b3-bc55-97df8dab3e41'

var keyVaultCryptoOfficerRole = '14b46e9e-c2b7-41b4-b07b-48a6ebf60603'
Comment thread
ahitacat marked this conversation as resolved.

resource contributorAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
name: guid(subscription().id, botPrincipalId, contributorRole)
scope: subscription()
Expand Down Expand Up @@ -71,3 +73,13 @@ resource grafanaAdminAssignment 'Microsoft.Authorization/roleAssignments@2022-04
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', grafanaAdminRole)
}
}

resource keyVaultCryptoOfficerAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
name: guid(subscription().id, botPrincipalId, keyVaultCryptoOfficerRole)
scope: subscription()
properties: {
Comment thread
ahitacat marked this conversation as resolved.
principalId: botPrincipalId
principalType: 'ServicePrincipal'
roleDefinitionId: subscriptionResourceId('Microsoft.Authorization/roleDefinitions', keyVaultCryptoOfficerRole)
Comment on lines +79 to +83
}
}