github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "Drop support for --gce-service-account, require activated creds""

Browse Source
This commit is contained in:
Erick Fejta
2016-08-02 20:34:02 -07:00
committed by GitHub
parent f614cb4347
commit 548780f05a
4 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hack/jenkins/e2e-runner.sh
View File

@@ -247,7 +247,6 @@ fi
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}"
unset GCE_SERVICE_ACCOUNT # Use checked in credentials, not the metadata server
unset KUBEKINS_SERVICE_ACCOUNT_FILE
elif [[ -n "${KUBEKINS_SERVICE_ACCOUNT_FILE:-}" ]]; then
echo "ERROR: cannot access service account file at: ${KUBEKINS_SERVICE_ACCOUNT_FILE}"