From ac839f3c938b14af3804b41f7f1486b48ecc7438 Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@amazon.com>
Date: Mon, 11 Nov 2019 18:51:55 +0000
Subject: [PATCH] Swith to use kops 1.16

---
 hack/run-e2e-test | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/hack/run-e2e-test b/hack/run-e2e-test
index f13856a4a1..abe449a39a 100755
--- a/hack/run-e2e-test
+++ b/hack/run-e2e-test
@@ -32,17 +32,15 @@ source $(dirname "${BASH_SOURCE}")/utils/helm.sh
 
 echo "Testing in region: $REGION and zones: $ZONES"
 
-#KOPS_DOWNLOAD_URL=https://github.com/kubernetes/kops/releases/download/1.14.0-alpha.1/kops-$OS_ARCH
+KOPS_DOWNLOAD_URL=https://github.com/kubernetes/kops/releases/download/1.16.0-alpha.1/kops-$OS_ARCH
 KOPS_PATH=$TEST_DIR/kops
 KOPS_STATE_FILE=s3://k8s-kops-csi-e2e
 
 # Download kops if not yet
 if [[ ! -e $KOPS_PATH ]]; then
     mkdir -p $TEST_DIR
-    #echo "Downloading KOPS from $KOPS_DOWNLOAD_URL to $KOPS_PATH"
-    #curl -L -X GET $KOPS_DOWNLOAD_URL -o $KOPS_PATH
-    echo "Downloading KOPS from s3 to $KOPS_PATH"
-    aws s3 cp ${KOPS_STATE_FILE}/kops/bin/kops $KOPS_PATH
+    echo "Downloading KOPS from $KOPS_DOWNLOAD_URL to $KOPS_PATH"
+    curl -L -X GET $KOPS_DOWNLOAD_URL -o $KOPS_PATH
 fi
 
 chmod +x $KOPS_PATH
@@ -63,7 +61,6 @@ CLUSTER_YAML_PATH=$TEST_DIR/$CLUSTER_NAME.yaml
 SSH_KEY_PATH=$TEST_DIR/id_rsa
 ssh-keygen -P csi-e2e -f $SSH_KEY_PATH
 
-export KOPS_BASE_URL=https://k8s-kops-csi-e2e.s3.amazonaws.com/kops/1.16.0-alpha.1/
 K8S_VERSION=https://k8s-kops-csi-e2e.s3.amazonaws.com/kubernetes/dev/v1.17.0-dev/
 $KOPS_PATH create cluster --state $KOPS_STATE_FILE \
     --zones $ZONES \