From f156f3992b54d912b728d68f727aa11917dda4f5 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Wed, 2 Sep 2020 12:23:08 -0400
Subject: [PATCH] Update go to 1.5.1 and add arm64

---
 images/test-runner/Makefile          | 8 ++++----
 images/test-runner/rootfs/Dockerfile | 9 ++++-----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile
index f796cf7c3..3fbc99d24 100644
--- a/images/test-runner/Makefile
+++ b/images/test-runner/Makefile
@@ -27,7 +27,7 @@ IMAGE = $(REGISTRY)/e2e-test-runner
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
 # build with buildx
-PLATFORMS?=linux/amd64
+PLATFORMS?=linux/amd64,linux/arm64
 OUTPUT=
 PROGRESS=plain
 
@@ -37,9 +37,9 @@ build: ensure-buildx
 		--progress=$(PROGRESS) \
 		--pull \
 		--build-arg BASE_IMAGE=k8s.gcr.io/ingress-nginx/nginx:v20200812-g0673e5e17@sha256:3bafc6840f2477c05eb029580fa8ecf4bd33b0f0765e3cd9cc82ad91f817ccf3 \
-		--build-arg GOLANG_VERSION=1.15 \
+		--build-arg GOLANG_VERSION=1.15.1 \
 		--build-arg ETCD_VERSION=3.4.3-0 \
-		--build-arg K8S_RELEASE=v1.15.7 \
+		--build-arg K8S_RELEASE=v1.18.6 \
 		--build-arg RESTY_CLI_VERSION=0.25 \
 		--build-arg RESTY_CLI_SHA=7c3d1317d7ddab2030b49610c89e301995d4ae0f815f16466c48144d05ec7bcb \
 		--build-arg LUAROCKS_VERSION=3.3.1 \
@@ -47,7 +47,7 @@ build: ensure-buildx
 		--build-arg CHART_TESTING_VERSION=3.0.0 \
 		--build-arg YAML_LINT_VERSION=1.13.0 \
 		--build-arg YAMALE_VERSION=1.8.0 \
-		--build-arg HELM_VERSION=v3.2.1 \
+		--build-arg HELM_VERSION=v3.3.1 \
 		-t $(IMAGE):$(TAG) rootfs
 
 # push the cross built image
diff --git a/images/test-runner/rootfs/Dockerfile b/images/test-runner/rootfs/Dockerfile
index 7bc374990..1018c0c80 100644
--- a/images/test-runner/rootfs/Dockerfile
+++ b/images/test-runner/rootfs/Dockerfile
@@ -26,6 +26,8 @@ RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf
 COPY --from=GO   /usr/local/go /usr/local/go
 COPY --from=etcd /usr/local/bin/etcd /usr/local/bin/etcd
 
+RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
+
 RUN apk add --no-cache \
   bash \
   ca-certificates \
@@ -39,7 +41,8 @@ RUN apk add --no-cache \
   py-crcmod \
   py-pip \
   unzip \
-  openssl
+  openssl \
+  cfssl@testing
 
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
@@ -109,10 +112,6 @@ RUN wget -O /tmp/helm.tgz \
   && cp /tmp/linux*/helm /usr/local/bin \
   && rm -rf /tmp/*
 
-RUN  wget -O /usr/local/bin/cfssl     https://github.com/cloudflare/cfssl/releases/download/v1.4.1/cfssl_1.4.1_linux_${TARGETARCH} \
-  && wget -O /usr/local/bin/cfssljson https://github.com/cloudflare/cfssl/releases/download/v1.4.1/cfssljson_1.4.1_linux_${TARGETARCH} \
-  && chmod +x /usr/local/bin/cfssl*
-
 # Install a YAML Linter
 ARG YAML_LINT_VERSION
 RUN pip install "yamllint==$YAML_LINT_VERSION"