From a7e43b2006bc2f6070ed0eaaa4a8535f6c187522 Mon Sep 17 00:00:00 2001
From: Nolan Brubaker <brubakern@vmware.com>
Date: Wed, 4 Sep 2019 11:52:05 -0400
Subject: [PATCH] Use a more updated gcloud

Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
---
 .travis.yml      | 3 ++-
 hack/gcr-push.sh | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 695583831..e6e610ca3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,9 @@ script:
   - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$TRAVIS_PULL_REQUEST, BRANCH=$BRANCH"
   - hack/ci-check.sh
 
-# gcloud sdk is needed to upload docker images
+# gcloud sdk is needed to upload docker images, but we want an updated version
 before_deploy:
+  - apt-get remove google-cloud-sdk
   - if [ ! -d ${HOME}/google-cloud-sdk ]; then curl https://sdk.cloud.google.com | bash
     /dev/stdin --disable-prompts; fi
 
diff --git a/hack/gcr-push.sh b/hack/gcr-push.sh
index 835b3eed5..8c3cc725d 100755
--- a/hack/gcr-push.sh
+++ b/hack/gcr-push.sh
@@ -58,6 +58,7 @@ ls -al /home/travis/.docker
 cat /home/travis/.docker/config.json
 docker --version
 gcloud --version
+which gcloud
 echo "END DIAGNOSTICS"
 
 echo "Building and pushing container images."