Skip to content

Commit 7d47ecb

Browse files
bwagner5bwagner5
committed
remove tty on container execs
temp setting go-report-card to 93
1 parent 793b06d commit 7d47ecb

7 files changed

+27
-25
lines changed

‎test/e2e/asg-lifecycle-sqs-test

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ localstack_pod=$(kubectl get pods --selector app=localstack --field-selector="st
4747
-o go-template --template '{{range .items}}{{.metadata.name}} {{.metadata.creationTimestamp}}{{"\n"}}{{end}}' \
4848
| awk '$2 >= "'"${START_TIME//+0000/Z}"'" { print $1 }')
4949
echo "🥑 Using localstack pod ${localstack_pod}"
50-
run_instances_resp=$(kubectl exec -it "${localstack_pod}" -- bash -c "${RUN_INSTANCE_CMD}")
50+
run_instances_resp=$(kubectl exec -i "${localstack_pod}" -- bash -c "${RUN_INSTANCE_CMD}")
5151
private_dns_name=$(echo "${run_instances_resp}" | jq -r '.Instances[] .PrivateDnsName')
5252
instance_id=$(echo "${run_instances_resp}" | jq -r '.Instances[] .InstanceId')
5353
echo "🥑 Started mock EC2 instance ($instance_id) w/ private DNS name: ${private_dns_name}"
5454
set -x
5555
CREATE_SQS_CMD="awslocal sqs create-queue --queue-name "${CLUSTER_NAME}-queue" --attributes MessageRetentionPeriod=300 --region ${AWS_REGION}"
56-
queue_url=$(kubectl exec -it "${localstack_pod}" -- bash -c "${CREATE_SQS_CMD}" | jq -r .QueueUrl)
56+
queue_url=$(kubectl exec -i "${localstack_pod}" -- bash -c "${CREATE_SQS_CMD}" | jq -r .QueueUrl)
5757

5858
echo "🥑 Created SQS Queue ${queue_url}"
5959

@@ -148,7 +148,7 @@ EOF
148148

149149
ASG_TERMINATE_EVENT_ONE_LINE=$(echo "${ASG_TERMINATE_EVENT}" | tr -d '\n' |sed 's/\"/\\"/g')
150150
SEND_SQS_CMD="awslocal sqs send-message --queue-url ${queue_url} --message-body \"${ASG_TERMINATE_EVENT_ONE_LINE}\" --region ${AWS_REGION}"
151-
kubectl exec -it "${localstack_pod}" -- bash -c "$SEND_SQS_CMD"
151+
kubectl exec -i "${localstack_pod}" -- bash -c "$SEND_SQS_CMD"
152152
echo "✅ Sent Spot Interruption Event to SQS queue: ${queue_url}"
153153

154154
cordoned=0

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ localstack_pod=$(kubectl get pods --selector app=localstack --field-selector="st
4848
-o go-template --template '{{range .items}}{{.metadata.name}} {{.metadata.creationTimestamp}}{{"\n"}}{{end}}' \
4949
| awk '$2 >= "'"${START_TIME//+0000/Z}"'" { print $1 }')
5050
echo "🥑 Using localstack pod $localstack_pod"
51-
run_instances_resp=$(kubectl exec -it "${localstack_pod}" -- bash -c "$RUN_INSTANCE_CMD")
51+
run_instances_resp=$(kubectl exec -i "${localstack_pod}" -- bash -c "$RUN_INSTANCE_CMD")
5252
private_dns_name=$(echo "${run_instances_resp}" | jq -r '.Instances[] .PrivateDnsName')
5353
instance_id=$(echo "${run_instances_resp}" | jq -r '.Instances[] .InstanceId')
5454
echo "🥑 Started mock EC2 instance ($instance_id) w/ private DNS name: ${private_dns_name}"
5555

5656
CREATE_SQS_CMD="awslocal sqs create-queue --queue-name "${CLUSTER_NAME}-queue" --attributes MessageRetentionPeriod=300 --region ${AWS_REGION}"
57-
queue_url=$(kubectl exec -it "${localstack_pod}" -- bash -c "$CREATE_SQS_CMD" | jq -r .QueueUrl)
57+
queue_url=$(kubectl exec -i "${localstack_pod}" -- bash -c "$CREATE_SQS_CMD" | jq -r .QueueUrl)
5858

5959
echo "🥑 Created SQS Queue ${queue_url}"
6060

@@ -147,7 +147,7 @@ EOF
147147

148148
EC2_STATE_CHANGE_EVENT_ONE_LINE=$(echo "${EC2_STATE_CHANGE_EVENT}" | tr -d '\n' |sed 's/\"/\\"/g')
149149
SEND_SQS_CMD="awslocal sqs send-message --queue-url ${queue_url} --message-body \"${EC2_STATE_CHANGE_EVENT_ONE_LINE}\" --region ${AWS_REGION}"
150-
kubectl exec -it "${localstack_pod}" -- bash -c "$SEND_SQS_CMD"
150+
kubectl exec -i "${localstack_pod}" -- bash -c "$SEND_SQS_CMD"
151151
echo "✅ Sent EC2 State Change Event to SQS queue: ${queue_url}"
152152

153153
GET_ATTRS_SQS_CMD="awslocal sqs get-queue-attributes --queue-url ${queue_url} --attribute-names All --region ${AWS_REGION}"
@@ -166,8 +166,8 @@ for i in $(seq 1 $TAINT_CHECK_CYCLES); do
166166
evicted=1
167167
fi
168168

169-
if [[ ${evicted} -eq 1 && $(kubectl exec -it "${localstack_pod}" -- bash -c "$GET_ATTRS_SQS_CMD" | jq '(.Attributes.ApproximateNumberOfMessagesNotVisible|tonumber) + (.Attributes.ApproximateNumberOfMessages|tonumber)' ) -eq 0 ]]; then
170-
kubectl exec -it "${localstack_pod}" -- bash -c "$GET_ATTRS_SQS_CMD"
169+
if [[ ${evicted} -eq 1 && $(kubectl exec -i "${localstack_pod}" -- bash -c "$GET_ATTRS_SQS_CMD" | jq '(.Attributes.ApproximateNumberOfMessagesNotVisible|tonumber) + (.Attributes.ApproximateNumberOfMessages|tonumber)' ) -eq 0 ]]; then
170+
kubectl exec -i "${localstack_pod}" -- bash -c "$GET_ATTRS_SQS_CMD"
171171
echo "✅ Verified the message was deleted from the queue after processing!"
172172
echo "✅ EC2 State Change SQS Test Passed $CLUSTER_NAME! ✅"
173173
exit 0

‎test/e2e/rebalance-recommendation-sqs-test

+8-8
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ localstack_pod=$(kubectl get pods --selector app=localstack --field-selector="st
4747
-o go-template --template '{{range .items}}{{.metadata.name}} {{.metadata.creationTimestamp}}{{"\n"}}{{end}}' \
4848
| awk '$2 >= "'"${START_TIME//+0000/Z}"'" { print $1 }')
4949
echo "🥑 Using localstack pod ${localstack_pod}"
50-
run_instances_resp=$(kubectl exec -it "${localstack_pod}" -- bash -c "${RUN_INSTANCE_CMD}")
50+
run_instances_resp=$(kubectl exec -i "${localstack_pod}" -- bash -c "${RUN_INSTANCE_CMD}")
5151
private_dns_name=$(echo "${run_instances_resp}" | jq -r '.Instances[] .PrivateDnsName')
5252
instance_id=$(echo "${run_instances_resp}" | jq -r '.Instances[] .InstanceId')
5353
echo "🥑 Started mock EC2 instance (${instance_id}) w/ private DNS name: ${private_dns_name}"
5454

5555
CREATE_SQS_CMD="awslocal sqs create-queue --queue-name "${CLUSTER_NAME}-queue" --attributes MessageRetentionPeriod=300 --region ${AWS_REGION}"
56-
queue_url=$(kubectl exec -it "${localstack_pod}" -- bash -c "${CREATE_SQS_CMD}" | jq -r .QueueUrl)
56+
queue_url=$(kubectl exec -i "${localstack_pod}" -- bash -c "${CREATE_SQS_CMD}" | jq -r .QueueUrl)
5757

5858
echo "🥑 Created SQS Queue ${queue_url}"
5959

@@ -146,7 +146,7 @@ EOF
146146

147147
REBALANCE_EVENT_ONE_LINE=$(echo "${REBALANCE_EVENT}" | tr -d '\n' |sed 's/\"/\\"/g')
148148
SEND_SQS_CMD="awslocal sqs send-message --queue-url ${queue_url} --message-body \"${REBALANCE_EVENT_ONE_LINE}\" --region ${AWS_REGION}"
149-
kubectl exec -it "${localstack_pod}" -- bash -c "${SEND_SQS_CMD}"
149+
kubectl exec -i "${localstack_pod}" -- bash -c "${SEND_SQS_CMD}"
150150
echo "✅ Sent Rebalance Recommendation to SQS queue: ${queue_url}"
151151

152152
GET_ATTRS_SQS_CMD="awslocal sqs get-queue-attributes --queue-url ${queue_url} --attribute-names All --region ${AWS_REGION}"
@@ -172,8 +172,8 @@ for i in $(seq 1 $TAINT_CHECK_CYCLES); do
172172
not_evicted=1
173173
fi
174174

175-
if [[ ${tainted} -eq 1 && $(kubectl exec -it "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}" | jq '(.Attributes.ApproximateNumberOfMessagesNotVisible|tonumber) + (.Attributes.ApproximateNumberOfMessages|tonumber)' ) -eq 0 ]]; then
176-
kubectl exec -it "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}"
175+
if [[ ${tainted} -eq 1 && $(kubectl exec -i "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}" | jq '(.Attributes.ApproximateNumberOfMessagesNotVisible|tonumber) + (.Attributes.ApproximateNumberOfMessages|tonumber)' ) -eq 0 ]]; then
176+
kubectl exec -i "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}"
177177
echo "✅ Verified the message was deleted from the queue after processing!"
178178
message_deleted=1
179179
break
@@ -220,7 +220,7 @@ EOF
220220

221221
SPOT_EVENT_ONE_LINE=$(echo "${SPOT_EVENT}" | tr -d '\n' |sed 's/\"/\\"/g')
222222
SEND_SQS_CMD="awslocal sqs send-message --queue-url ${queue_url} --message-body \"${SPOT_EVENT_ONE_LINE}\" --region ${AWS_REGION}"
223-
kubectl exec -it "${localstack_pod}" -- bash -c "${SEND_SQS_CMD}"
223+
kubectl exec -i "${localstack_pod}" -- bash -c "${SEND_SQS_CMD}"
224224
echo "✅ Sent Spot Interruption Event to SQS queue: ${queue_url}"
225225
GET_ATTRS_SQS_CMD="awslocal sqs get-queue-attributes --queue-url ${queue_url} --attribute-names All --region ${AWS_REGION}"
226226

@@ -232,8 +232,8 @@ for i in $(seq 1 $TAINT_CHECK_CYCLES); do
232232
evicted=1
233233
fi
234234

235-
if [[ ${evicted} -eq 1 && $(kubectl exec -it "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}" | jq '(.Attributes.ApproximateNumberOfMessagesNotVisible|tonumber) + (.Attributes.ApproximateNumberOfMessages|tonumber)' ) -eq 0 ]]; then
236-
kubectl exec -it "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}"
235+
if [[ ${evicted} -eq 1 && $(kubectl exec -i "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}" | jq '(.Attributes.ApproximateNumberOfMessagesNotVisible|tonumber) + (.Attributes.ApproximateNumberOfMessages|tonumber)' ) -eq 0 ]]; then
236+
kubectl exec -i "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}"
237237
echo "✅ Verified the message was deleted from the queue after processing!"
238238
echo "✅ Rebalance Recommendation SQS Test Passed $CLUSTER_NAME! ✅"
239239
exit 0

‎test/e2e/spot-interruption-sqs-test

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ localstack_pod=$(kubectl get pods --selector app=localstack --field-selector="st
4747
-o go-template --template '{{range .items}}{{.metadata.name}} {{.metadata.creationTimestamp}}{{"\n"}}{{end}}' \
4848
| awk '$2 >= "'"${START_TIME//+0000/Z}"'" { print $1 }')
4949
echo "🥑 Using localstack pod ${localstack_pod}"
50-
run_instances_resp=$(kubectl exec -it "${localstack_pod}" -- bash -c "${RUN_INSTANCE_CMD}")
50+
run_instances_resp=$(kubectl exec -i "${localstack_pod}" -- bash -c "${RUN_INSTANCE_CMD}")
5151
private_dns_name=$(echo "${run_instances_resp}" | jq -r '.Instances[] .PrivateDnsName')
5252
instance_id=$(echo "${run_instances_resp}" | jq -r '.Instances[] .InstanceId')
5353
echo "🥑 Started mock EC2 instance (${instance_id}) w/ private DNS name: ${private_dns_name}"
5454

5555
CREATE_SQS_CMD="awslocal sqs create-queue --queue-name "${CLUSTER_NAME}-queue" --attributes MessageRetentionPeriod=300 --region ${AWS_REGION}"
56-
queue_url=$(kubectl exec -it "${localstack_pod}" -- bash -c "${CREATE_SQS_CMD}" | jq -r .QueueUrl)
56+
queue_url=$(kubectl exec -i "${localstack_pod}" -- bash -c "${CREATE_SQS_CMD}" | jq -r .QueueUrl)
5757

5858
echo "🥑 Created SQS Queue ${queue_url}"
5959

@@ -145,7 +145,7 @@ EOF
145145

146146
SPOT_EVENT_ONE_LINE=$(echo "${SPOT_EVENT}" | tr -d '\n' |sed 's/\"/\\"/g')
147147
SEND_SQS_CMD="awslocal sqs send-message --queue-url ${queue_url} --message-body \"${SPOT_EVENT_ONE_LINE}\" --region ${AWS_REGION}"
148-
kubectl exec -it "${localstack_pod}" -- bash -c "${SEND_SQS_CMD}"
148+
kubectl exec -i "${localstack_pod}" -- bash -c "${SEND_SQS_CMD}"
149149
echo "✅ Sent Spot Interruption Event to SQS queue: ${queue_url}"
150150

151151
GET_ATTRS_SQS_CMD="awslocal sqs get-queue-attributes --queue-url ${queue_url} --attribute-names All --region ${AWS_REGION}"
@@ -164,8 +164,8 @@ for i in $(seq 1 $TAINT_CHECK_CYCLES); do
164164
evicted=1
165165
fi
166166

167-
if [[ ${evicted} -eq 1 && $(kubectl exec -it "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}" | jq '(.Attributes.ApproximateNumberOfMessagesNotVisible|tonumber) + (.Attributes.ApproximateNumberOfMessages|tonumber)' ) -eq 0 ]]; then
168-
kubectl exec -it "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}"
167+
if [[ ${evicted} -eq 1 && $(kubectl exec -i "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}" | jq '(.Attributes.ApproximateNumberOfMessagesNotVisible|tonumber) + (.Attributes.ApproximateNumberOfMessages|tonumber)' ) -eq 0 ]]; then
168+
kubectl exec -i "${localstack_pod}" -- bash -c "${GET_ATTRS_SQS_CMD}"
169169
echo "✅ Verified the message was deleted from the queue after processing!"
170170
echo "✅ Spot Interruption SQS Test Passed $CLUSTER_NAME! ✅"
171171
exit 0

‎test/e2e/webhook-http-proxy-test

+2-2
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ for i in `seq 1 $TAINT_CHECK_CYCLES`; do
181181
fi
182182

183183
webhook_hostname=$(echo "${WEBHOOK_URL}" | sed -e 's@^[^/]*//@@' -e 's@/.*$@@')
184-
if [[ $sent -eq 1 ]] && kubectl exec -it "$(echo $squid_worker_pods | cut -d' ' -f1)" -- cat /var/log/squid/access.log | grep "${webhook_hostname}" >/dev/null; then
184+
if [[ $sent -eq 1 ]] && kubectl exec -i "$(echo $squid_worker_pods | cut -d' ' -f1)" -- cat /var/log/squid/access.log | grep "${webhook_hostname}" >/dev/null; then
185185
echo "✅ Verified the webhook POST used the http proxy"
186186
exit 0
187187
fi
@@ -200,7 +200,7 @@ else
200200
fi
201201

202202
echo "===================================== SQUID LOGS ===================================================="
203-
kubectl exec -it "$(echo $squid_worker_pods | cut -d' ' -f1)" -- cat /var/log/squid/access.log
203+
kubectl exec -i "$(echo $squid_worker_pods | cut -d' ' -f1)" -- cat /var/log/squid/access.log
204204
echo "===================================== END SQUID LOGS ===================================================="
205205

206206
fail_and_exit 1

‎test/go-report-card-test/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ FROM public.ecr.aws/bitnami/golang:latest
22

33
WORKDIR /app
44

5-
ARG GO111MODULE=auto
5+
ENV GO111MODULE=auto
6+
ENV GOPROXY=direct
7+
68
RUN go get github.com/gojp/goreportcard
79
RUN cd $GOPATH/src/github.com/gojp/goreportcard && (make install || cd / && curl -L https://git.io/vp6lP | sh)
810

‎test/go-report-card-test/run-report-card-test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -euo pipefail
33

4-
THRESHOLD=98
4+
THRESHOLD=93
55
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
66
EXIT_CODE=0
77

0 commit comments

Comments
 (0)