fixes for adfs

jadarsie · Apr 25, 2020 · 643821a · 643821a
1 parent 54a5add
commit 643821a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/env/defaults.env b/env/defaults.env
@@ -1,5 +1,7 @@
+#!/bin/bash -e
+
 # Constants
-export DEV_IMAGE="quay.io/deis/go-dev:v1.25.0"
+export DEV_IMAGE="quay.io/deis/go-dev:v1.26.2"
 export API_PROFILE="2019-03-01-hybrid"
 export ENVIRONMENT_NAME="AzureStackCloud"
 export AUTHENTICATION_METHOD="client_secret"
@@ -16,11 +18,11 @@ export SKIP_LOGS_COLLECTION=true
 
 # First deployment repo & branch
 export AKSE_REPO="jadarsie/aks-engine"
-export AKSE_BRANCH="e2e"
+export AKSE_BRANCH="azs-e2e-adfs"
 
 # Upgrade/Scale repo & branch
 export UPGRADE_FORK="jadarsie"
-export UPGRADE_BRANCH="e2e"
+export UPGRADE_BRANCH="azs-e2e-adfs"
 
 # Scale
 export SCALE_CLUSTER=false

diff --git a/env/sample.env b/env/sample.env
@@ -1,3 +1,5 @@
+#!/bin/bash -e
+
 # CLOUD DETAILS
 export IDENTITY_SYSTEM=""           # azure_ad | adfs
 export CLOUD_FQDN=""
@@ -7,6 +9,8 @@ export AZURE_CLIENT_ID=""
 export AZURE_CLIENT_SECRET=""
 export AZURE_SUBSCRIPTION_ID=""
 export AZURE_TENANT_ID=""
+
+# if make run-dvm
 export SSH_PRIVATE_KEY=""           # path to private key
 export DVM_HOST=""
 

diff --git a/hack/cloud-variables.sh b/hack/cloud-variables.sh
@@ -16,12 +16,13 @@ echo export SUBSCRIPTION_ID=\"$AZURE_SUBSCRIPTION_ID\"
 echo export TENANT_ID=\"$AZURE_TENANT_ID\"
 echo export CUSTOM_CLOUD_CLIENT_ID=\"$AZURE_CLIENT_ID\"
 echo export CUSTOM_CLOUD_SECRET=\"$AZURE_CLIENT_SECRET\"
+echo export IDENTITY_SYSTEM=\"$IDENTITY_SYSTEM\"
 
 echo export PORTAL_ENDPOINT=\"https://portal.${AZURE_LOCATION}.${CLOUD_FQDN}\"
 echo export RESOURCE_MANAGER_ENDPOINT=\"https://management.${AZURE_LOCATION}.${CLOUD_FQDN}\"
 
 echo export SERVICE_MANAGEMENT_ENDPOINT=\"$(jq -r '.authentication.audiences | .[0]' "$METADATA")\"
-echo export ACTIVE_DIRECTORY_ENDPOINT=\"$(jq -r .authentication.loginEndpoint "$METADATA" | sed -e 's/adfs\/*$//')\"
+echo export ACTIVE_DIRECTORY_ENDPOINT=\"$(jq -r .authentication.loginEndpoint "$METADATA")\" # | sed -e 's/adfs\/*$//'
 echo export GALLERY_ENDPOINT=\"$(jq -r .galleryEndpoint "$METADATA")\"
 echo export GRAPH_ENDPOINT=\"$(jq -r .graphEndpoint "$METADATA")\"
 echo export KEY_VAULT_DNS_SUFFIX=\"".vault.${AZURE_LOCATION}.${CLOUD_FQDN}"\"