small fixes and cleanup (#1121)

equinor · Dec 6, 2023 · f1a493a · f1a493a
1 parent 00d30fa
commit f1a493a
Show file tree

Hide file tree

Showing 5 changed files with 141 additions and 85 deletions.
diff --git a/scripts/aks/bootstrap.sh b/scripts/aks/bootstrap.sh
@@ -523,7 +523,7 @@ VNET_ID="$(az network vnet show \
     --output tsv)"
 
 echo ""
-printf "Checking if %s are associated with %s" "$VNET_NAME" "$AZ_VNET_HUB_NAME"
+printf "Checking if %s are associated with %s\n" "$VNET_NAME" "$AZ_VNET_HUB_NAME"
 printf "Waiting for %s to get associated with %s..." "$VNET_NAME" "$AZ_VNET_HUB_NAME"
 while [ -z "$(az network vnet peering list --resource-group "$AZ_RESOURCE_GROUP_CLUSTERS" --vnet-name "$VNET_NAME" --query "[].id" --output tsv)" ]; do
     printf "."
@@ -672,14 +672,14 @@ managed_identity_id=$(az identity show \
     --query principalId \
     --output tsv)
 
-printf "Assigning Contributor role to ${MI_AKS} on scope of resource group ${node_pool_resource_group}..."
+printf "Assigning Contributor role to %s on scope of resource group %s..." "${MI_AKS}" "${node_pool_resource_group}"
 az role assignment create \
     --role Contributor \
     --assignee "$managed_identity_id" \
     --scope "$(az group show --name "${node_pool_resource_group}" --query id --output tsv)"
 printf "Done.\n"
 
-printf "Assigning Contributor role to ${MI_AKS} on scope of resource group ${AZ_RESOURCE_GROUP_COMMON}... \n"
+printf "Assigning Contributor role to %s on scope of resource group %s... \n" "${MI_AKS}" "${AZ_RESOURCE_GROUP_COMMON}"
 az role assignment create \
     --role Contributor \
     --assignee "$managed_identity_id" \