Skip to content

Commit

Permalink
Merge pull request #409 from leakingtapan/kops-1.16
Browse files Browse the repository at this point in the history
Swith to use kops 1.16
  • Loading branch information
Cheng Pan authored Nov 12, 2019
2 parents ad864a1 + ac839f3 commit 55f84a5
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions hack/run-e2e-test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand Down

0 comments on commit 55f84a5

Please sign in to comment.