Merge pull request #28725 from fejta/auth

Only activate service account when file exists
This commit is contained in:
Erick Fejta 2016-07-09 00:21:54 -07:00 committed by GitHub
commit a77010b3b3

View File

@ -151,9 +151,11 @@ if running_in_docker; then
fi
fi
if [[ -n "${KUBEKINS_SERVICE_ACCOUNT_FILE:-}" ]]; then
if [[ -f "${KUBEKINS_SERVICE_ACCOUNT_FILE:-}" ]]; then
echo 'Activating service account...' # No harm in doing this multiple times.
gcloud auth activate-service-account --key-file="${KUBEKINS_SERVICE_ACCOUNT_FILE}"
elif [[ -n "${KUBEKINS_SERVICE_ACCOUNT_FILE:-}" ]]; then
echo "ERROR: cannot access service account file at: ${KUBEKINS_SERVICE_ACCOUNT_FILE}"
fi
# Install gcloud from a custom path if provided. Used to test GKE with gcloud