Minor fixes (#280)

* remove aemm from sqs tests

* align helm install instructs

Author: brycahta

config/helm/aws-node-termination-handler/README.md

@@ -16,8 +16,9 @@ Install AWS Node Termination Handler:
 To install the chart with the release name aws-node-termination-handler and default configuration:
 
 ```sh
-helm install --name aws-node-termination-handler \
-  --namespace kube-system eks/aws-node-termination-handler
+helm upgrade --install aws-node-termination-handler \
+  --namespace kube-system \
+  eks/aws-node-termination-handler
 ```
 
 To install into an EKS cluster where the Node Termination Handler is already installed, you can run:

test/e2e/asg-lifecycle-sqs-test

@@ -40,22 +40,6 @@ set -x
 helm "${localstack_helm_args[@]}"
 set +x
 
-aemm_helm_args=(
-  upgrade
-  --install
-  "$CLUSTER_NAME-aemm"
-  "$AEMM_DL_URL"
-  --namespace default
-  --set servicePort="$IMDS_PORT"
-  --wait
-)
-[[ ${#common_helm_args[@]} -gt 0 ]] &&
-    aemm_helm_args+=("${common_helm_args[@]}")
-
-set -x
-retry 5 helm "${aemm_helm_args[@]}"
-set +x
-
 sleep 10
 
 RUN_INSTANCE_CMD="awslocal ec2 run-instances --private-ip-address ${WORKER_IP} --region ${AWS_REGION}"
@@ -79,7 +63,6 @@ anth_helm_args=(
   "$CLUSTER_NAME-acth"
   "$SCRIPTPATH/../../config/helm/aws-node-termination-handler/"
   --namespace kube-system
-  --set instanceMetadataURL="${INSTANCE_METADATA_URL:-"http://$AEMM_URL:$IMDS_PORT"}"
   --set image.repository="$NODE_TERMINATION_HANDLER_DOCKER_REPO"
   --set image.tag="$NODE_TERMINATION_HANDLER_DOCKER_TAG"
   --set awsAccessKeyID=foo

test/e2e/ec2-state-change-sqs-test

@@ -40,22 +40,6 @@ set -x
 helm "${localstack_helm_args[@]}"
 set +x
 
-aemm_helm_args=(
-  upgrade
-  --install
-  "$CLUSTER_NAME-aemm"
-  "$AEMM_DL_URL"
-  --namespace default
-  --set servicePort="$IMDS_PORT"
-  --wait
-)
-[[ ${#common_helm_args[@]} -gt 0 ]] &&
-    aemm_helm_args+=("${common_helm_args[@]}")
-
-set -x
-retry 5 helm "${aemm_helm_args[@]}"
-set +x
-
 sleep 10
 
 RUN_INSTANCE_CMD="awslocal ec2 run-instances --private-ip-address ${WORKER_IP} --region ${AWS_REGION}"

test/e2e/rebalance-recommendation-sqs-test

@@ -40,23 +40,6 @@ set -x
 helm "${localstack_helm_args[@]}"
 set +x
 
-aemm_helm_args=(
-  upgrade
-  --install
-  "$CLUSTER_NAME-aemm"
-  "$AEMM_DL_URL"
-  --namespace default
-  --set servicePort="$IMDS_PORT"
-  --wait
-)
-
-[[ ${#common_helm_args[@]} -gt 0 ]] &&
-    aemm_helm_args+=("${common_helm_args[@]}")
-
-set -x
-retry 5 helm "${aemm_helm_args[@]}"
-set +x
-
 sleep 10
 
 RUN_INSTANCE_CMD="awslocal ec2 run-instances --private-ip-address ${WORKER_IP} --region ${AWS_REGION}"
@@ -80,7 +63,6 @@ anth_helm_args=(
   "$CLUSTER_NAME-acth"
   "$SCRIPTPATH/../../config/helm/aws-node-termination-handler/"
   --namespace kube-system
-  --set instanceMetadataURL="${INSTANCE_METADATA_URL:-"http://$AEMM_URL:$IMDS_PORT"}"
   --set image.repository="$NODE_TERMINATION_HANDLER_DOCKER_REPO"
   --set image.tag="$NODE_TERMINATION_HANDLER_DOCKER_TAG"
   --set awsAccessKeyID=foo

test/e2e/spot-interruption-sqs-test

@@ -40,22 +40,6 @@ set -x
 helm "${localstack_helm_args[@]}"
 set +x
 
-aemm_helm_args=(
-  upgrade
-  --install
-  "$CLUSTER_NAME-aemm"
-  "$AEMM_DL_URL"
-  --namespace default
-  --set servicePort="$IMDS_PORT"
-  --wait
-)
-[[ ${#common_helm_args[@]} -gt 0 ]] &&
-    aemm_helm_args+=("${common_helm_args[@]}")
-
-set -x
-retry 5 helm "${aemm_helm_args[@]}"
-set +x
-
 sleep 10
 
 RUN_INSTANCE_CMD="awslocal ec2 run-instances --private-ip-address ${WORKER_IP} --region ${AWS_REGION}"
@@ -79,7 +63,6 @@ anth_helm_args=(
   "$CLUSTER_NAME-acth"
   "$SCRIPTPATH/../../config/helm/aws-node-termination-handler/"
   --namespace kube-system
-  --set instanceMetadataURL="${INSTANCE_METADATA_URL:-"http://$AEMM_URL:$IMDS_PORT"}"
   --set image.repository="$NODE_TERMINATION_HANDLER_DOCKER_REPO"
   --set image.tag="$NODE_TERMINATION_HANDLER_DOCKER_TAG"
   --set awsAccessKeyID=foo