update script to work with 0.5.4 aws-k8s-tester

The names of environment variables accepted by aws-k8s-tester changed
when the managed node group functionality was introduced. This commit
updates the integration testing scripts to call aws-k8s-tester (v.0.5.4
which is the release needed with the fix for aws/aws-k8s-tester#70) with
these updated environment variables.

We decrease the number of parallel builds of the echo job from 100 to
3 and the number of completions for that job from 1000 to 30. This
decreases the setup time of the cluster by about 10 minutes.

Finally, I added in a short-circuit to prevent double-deprovisioning of
the cluster if, say, a stacktrace occurred when running the
aws-k8s-tester tool.

Issue aws#686
Issue aws#784
Issue aws#786

scripts/lib/aws.sh

@@ -15,7 +15,7 @@ ensure_ecr_repo() {
 }
 
 ensure_aws_k8s_tester() {
-    TESTER_RELEASE=${TESTER_RELEASE:-v0.5.2}
+    TESTER_RELEASE=${TESTER_RELEASE:-v0.5.4}
     TESTER_DOWNLOAD_URL=https://github.com/aws/aws-k8s-tester/releases/download/$TESTER_RELEASE/aws-k8s-tester-$TESTER_RELEASE-$OS-$ARCH
 
     # Download aws-k8s-tester if not yet

scripts/lib/cluster.sh

@@ -13,14 +13,20 @@ function up-test-cluster() {
     AWS_K8S_TESTER_EKS_CLUSTER_NAME=$CLUSTER_NAME \
         AWS_K8S_TESTER_EKS_KUBECONFIG_PATH=$KUBECONFIG_PATH \
         AWS_K8S_TESTER_EKS_KUBERNETES_VERSION=${K8S_VERSION%.*} \
-        AWS_K8S_TESTER_EKS_ENABLE_WORKER_NODE_PRIVILEGED_PORT_ACCESS=true \
-        AWS_K8S_TESTER_EKS_WORKER_NODE_ASG_MIN=3 \
-        AWS_K8S_TESTER_EKS_WORKER_NODE_ASG_MAX=3 \
-        AWS_K8S_TESTER_EKS_WORKER_NODE_ASG_DESIRED_CAPACITY=3 \
-        AWS_K8S_TESTER_EKS_WORKER_NODE_PRIVATE_KEY_PATH=$SSH_KEY_PATH \
-        AWS_K8S_TESTER_EKS_WORKER_NODE_INSTANCE_TYPE=m3.xlarge \
+        AWS_K8S_TESTER_EKS_ENABLE_MANAGED_NODE_GROUP_PRIVILEGED_PORT_ACCESS=true \
+        AWS_K8S_TESTER_EKS_MANAGED_NODE_GROUP_ASG_MIN=3 \
+        AWS_K8S_TESTER_EKS_MANAGED_NODE_GROUP_ASG_MAX=3 \
+        AWS_K8S_TESTER_EKS_MANAGED_NODE_GROUP_ASG_DESIRED_CAPACITY=3 \
+        AWS_K8S_TESTER_EKS_MANAGED_NODE_GROUP_REMOTE_ACCESS_PRIVATE_KEY_PATH=$SSH_KEY_PATH \
+        AWS_K8S_TESTER_EKS_MANAGED_NODE_GROUP_INSTANCE_TYPES=m3.xlarge \
         AWS_K8S_TESTER_EKS_AWS_K8S_TESTER_PATH=$TESTER_PATH \
         AWS_K8S_TESTER_EKS_AWS_IAM_AUTHENTICATOR_PATH=$AUTHENTICATOR_PATH \
+        AWS_K8S_TESTER_EKS_ADD_ON_JOB_ECHO_ENABLE=true \
+        AWS_K8S_TESTER_EKS_ADD_ON_JOB_ECHO_PARALLELS=3 \
+        AWS_K8S_TESTER_EKS_ADD_ON_JOB_ECHO_COMPLETES=30 \
+        AWS_K8S_TESTER_EKS_ADD_ON_JOB_PERL_ENABLE=true \
+        AWS_K8S_TESTER_EKS_ADD_ON_NLB_HELLO_WORLD_ENABLE=true \
+        AWS_K8S_TESTER_EKS_ADD_ON_ALB_2048_ENABLE=true \
         AWS_K8S_TESTER_EKS_KUBECTL_PATH=$KUBECTL_PATH \
     $TESTER_PATH eks create config --path $CLUSTER_CONFIG 1>&2
     echo -n "Creating cluster $CLUSTER_NAME (this may take ~20 mins. details: tail -f $CLUSTER_MANAGE_LOG_PATH)... "

scripts/run-integration-tests.sh

@@ -18,11 +18,14 @@ DEPROVISION=${DEPROVISION:-true}
 BUILD=${BUILD:-true}
 
 __cluster_created=0
+__cluster_deprovisioned=0
 
 on_error() {
     # Make sure we destroy any cluster that was created if we hit run into an
     # error when attempting to run tests against the cluster
-    if [[ $__cluster_created -eq 1 ]]; then
+    if [[ $__cluster_created -eq 1 && $__cluster_deprovisioned -eq 0 && "$DEPROVISION" = true ]]; then
+        # prevent double-deprovisioning with ctrl-c during deprovisioning...
+        __cluster_deprovisioned=1
         echo "Cluster was provisioned already. Deprovisioning it..."
         down-test-cluster
     fi