Skip to content

Commit fc4e2d1

Browse files
authored
re-enable tls tests with new certs (#4397)
* Revert "temporaily remove certs from e2e test until kubernetes/k8s.io#8552 is resolved" This reverts commit 3a310be. * use new certs
1 parent e59b39f commit fc4e2d1

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

scripts/ci_e2e_test.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,13 @@ test_controller_image() {
204204

205205
AWS_ACCOUNT_ID=$(aws sts get-caller-identity --region ${AWS_REGION} --query Account --output text)
206206
S3_BUCKET=${S3_BUCKET:-"lb-controller-e2e-${AWS_ACCOUNT_ID}"}
207-
#CERTIFICATE_ARN_PREFIX=arn:aws:acm:${AWS_REGION}:${AWS_ACCOUNT_ID}:certificate
208-
#echo "updated the CERT_IDs"
209-
#CERT_ID1="d39a65e5-44f6-4734-9034-6c82ae7df73b"
210-
#CERT_ID2="35d7e09b-c4a9-447e-ba8c-7f9f29b77c8f"
211-
#CERT_ID3="f44d1a16-409a-4937-a420-b42dab2d384a"
212-
#CERTIFICATE_ARNS=${CERTIFICATE_ARNS:-"${CERTIFICATE_ARN_PREFIX}/${CERT_ID1},${CERTIFICATE_ARN_PREFIX}/${CERT_ID2},${CERTIFICATE_ARN_PREFIX}/${CERT_ID3}"}
213-
#echo "creating s3 bucket $S3_BUCKET"
207+
CERTIFICATE_ARN_PREFIX=arn:aws:acm:${AWS_REGION}:${AWS_ACCOUNT_ID}:certificate
208+
echo "updated the CERT_IDs"
209+
CERT_ID1="bfd3d659-90b9-489b-8961-6bf448492726"
210+
CERT_ID2="c9f12ef2-4bd6-4c0f-ac9d-94f7683042a7"
211+
CERT_ID3="10b8651f-708d-4a26-941a-db784610cd6e"
212+
CERTIFICATE_ARNS=${CERTIFICATE_ARNS:-"${CERTIFICATE_ARN_PREFIX}/${CERT_ID1},${CERTIFICATE_ARN_PREFIX}/${CERT_ID2},${CERTIFICATE_ARN_PREFIX}/${CERT_ID3}"}
213+
echo "creating s3 bucket $S3_BUCKET"
214214
aws s3api create-bucket --bucket $S3_BUCKET --region $AWS_REGION --create-bucket-configuration LocationConstraint=$AWS_REGION || true
215215
ginkgo -timeout 3h -v -r test/e2e -- \
216216
--kubeconfig=${CLUSTER_KUBECONFIG} \
@@ -219,8 +219,8 @@ test_controller_image() {
219219
--aws-vpc-id=${cluster_vpc_id} \
220220
--helm-chart=${HELM_DIR}/aws-load-balancer-controller \
221221
--controller-image=${CONTROLLER_IMAGE_NAME} \
222-
--s3-bucket-name=${S3_BUCKET} #\
223-
# --certificate-arns=${CERTIFICATE_ARNS}
222+
--s3-bucket-name=${S3_BUCKET} \
223+
--certificate-arns=${CERTIFICATE_ARNS}
224224
}
225225

226226

0 commit comments

Comments
 (0)