Skip to content

Trailing spaces for azureCloudName and identitytype is causing script failure in certain scenarios #514

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
ganga1980 merged 3 commits into from
Mar 23, 2021
Merged

Trailing spaces for azureCloudName and identitytype is causing script failure in certain scenarios #514

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38f39a8
Update enable-monitoring.sh
seenu433 Mar 16, 2021
45ca855
Merge pull request #1 from seenu433/seenu433-patch-1
seenu433 Mar 16, 2021
fe69f92
fix merge conflicts
ganga1980 Mar 23, 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
4 changes: 2 additions & 2 deletions scripts/onboarding/managed/enable-monitoring.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ parse_args() {

validate_and_configure_supported_cloud() {
echo "get active azure cloud name configured to azure cli"
azureCloudName=$(az cloud show --query name -o tsv | tr "[:upper:]" "[:lower:]")
azureCloudName=$(az cloud show --query name -o tsv | tr "[:upper:]" "[:lower:]" | tr -d "[:space:]")
echo "active azure cloud name configured to azure cli: ${azureCloudName}"
if [ "$isArcK8sCluster" = true ]; then
if [ "$azureCloudName" != "azurecloud" -a "$azureCloudName" != "azureusgovernment" ]; then
Expand Down Expand Up @@ -340,7 +340,7 @@ validate_cluster_identity() {
local clusterName="$(echo ${2})"

local identitytype=$(az resource show -g ${rgName} -n ${clusterName} --resource-type $resourceProvider --query identity.type -o json)
identitytype=$(echo $identitytype | tr "[:upper:]" "[:lower:]" | tr -d '"')
identitytype=$(echo $identitytype | tr "[:upper:]" "[:lower:]" | tr -d '"' | tr -d "[:space:]")
Copy link
Contributor

@ganga1980 ganga1980 Mar 16, 2021

Choose a reason for hiding this comment

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

This check was added for private preview of Arc K8s. Since Arc K8s GA, identitytype check not required any more. Can you please help on removing this completely? And also, we are working release monitoring extension and that time this script not used any more.

echo "cluster identity type:" $identitytype

if [[ "$identitytype" != "systemassigned" ]]; then
Expand Down