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

use MSI for az login #116

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

use MSI for az login #116

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
327e436
use identity for az login if useManagedIdentityExtension=true and aad…
faisalchaudhrymc Jan 11, 2021
3b0b8ca
{} around az_managed_identity_extension
chaudhryfaisal Jun 10, 2021
6a8ac93
use identity for az login if useManagedIdentityExtension=true and aad…
faisalchaudhrymc Jun 10, 2021
6c138ab
Merge branch 'rancher:master' into master
chaudhryfaisal Jun 17, 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
9 changes: 7 additions & 2 deletions cloud-provider.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ set_azure_config() {
local az_subnet_name=$(cat "$AZURE_CLOUD_CONFIG_PATH" | jq -r .subnetName)
local az_vnet_name=$(cat "$AZURE_CLOUD_CONFIG_PATH" | jq -r .vnetName)
local az_vm_type=$(cat "$AZURE_CLOUD_CONFIG_PATH" | jq -r .vmType)
local az_managed_identity_extension=$(cat "$AZURE_CLOUD_CONFIG_PATH" | jq -r .useManagedIdentityExtension)

local az_vm_resources_group=$(curl -s -H Metadata:true "${AZURE_META_URL}/resourceGroupName?api-version=${AZURE_META_API_VERSION}&format=text")
local az_vm_name=$(curl -s -H Metadata:true "${AZURE_META_URL}/name?api-version=${AZURE_META_API_VERSION}&format=text")
Expand All @@ -32,8 +33,12 @@ set_azure_config() {
az cloud set --name ${azure_cloud}

# login to Azure
az login --service-principal -u ${azure_client_id} -p ${azure_client_secret} --tenant ${azure_tenant_id} 2>&1 > /dev/null

if [ "${az_managed_identity_extension}" = "true" ] && [ "${azure_client_secret}" = "" ]; then
echo "using MSI for az login"
az login --identity 2>&1 > /dev/null
else
az login --service-principal -u ${azure_client_id} -p ${azure_client_secret} --tenant ${azure_tenant_id} 2>&1 > /dev/null
fi
# set subscription to be the current active subscription
az account set --subscription ${az_subscription_id}

Expand Down
7 changes: 6 additions & 1 deletion windows/cloud-provider.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ function Complete-AzureCloudConfig
$azureClientId = $azCloudConfig.aadClientId
$azureClientSecret = $azCloudConfig.aadClientSecret
$azureTenantId = $azCloudConfig.tenantId
$useManagedIdentityExtension = $azCloudConfig.useManagedIdentityExtension

# verification
if (-not $azureClientId) {
Expand Down Expand Up @@ -68,7 +69,11 @@ function Complete-AzureCloudConfig
# NOTE: the escaping syntax around the secret is to ensure the azure-cli doesn't interpret the contents of the secret as a command.
# See this issue for more information:
# https://github.com/Azure/azure-cli/issues/8070
$errMsg = az login --service-principal -u $azureClientId -p "`"$azureClientSecret`"" --tenant $azureTenantId
$az_login_args='--service-principal -u $azureClientId -p "`"$azureClientSecret`"" --tenant $azureTenantId'
if (($useManagedIdentityExtension -eq "true") -and -not $azureClientSecret) {
$az_login_args='--identity'
}
$errMsg = az login $az_login_args
if (-not $?) {
Log-Fatal "Failed to login '$azureCloud' cloud: $errMsg"
}
Expand Down