diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index 47f4ab472..bf82ebaee 100755 --- a/build/run-in-docker.sh +++ b/build/run-in-docker.sh @@ -34,7 +34,7 @@ function cleanup { } trap cleanup EXIT -E2E_IMAGE=${E2E_IMAGE:-quay.io/kubernetes-ingress-controller/e2e:v05312020-d250b97b4} +E2E_IMAGE=${E2E_IMAGE:-gcr.io/k8s-staging-ingress-nginx/e2e-test-runner:v20200627-ingress-nginx-2.9.0-9-ga003eabd5} DOCKER_OPTS=${DOCKER_OPTS:-} diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile index 67bc40a03..647cd144a 100644 --- a/test/e2e-image/Dockerfile +++ b/test/e2e-image/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/kubernetes-ingress-controller/e2e:v05312020-d250b97b4 AS BASE +FROM gcr.io/k8s-staging-ingress-nginx/e2e-test-runner:v20200627-ingress-nginx-2.9.0-9-ga003eabd5 AS BASE FROM alpine:3.12 diff --git a/test/e2e/framework/deployment.go b/test/e2e/framework/deployment.go index 225f74b7a..134e61f28 100644 --- a/test/e2e/framework/deployment.go +++ b/test/e2e/framework/deployment.go @@ -52,7 +52,7 @@ func (f *Framework) NewEchoDeploymentWithReplicas(replicas int) { // replicas is configurable and // name is configurable func (f *Framework) NewEchoDeploymentWithNameAndReplicas(name string, replicas int) { - deployment := newDeployment(name, f.Namespace, "ingress-controller/echo:1.0.0-dev", 80, int32(replicas), + deployment := newDeployment(name, f.Namespace, "gcr.io/k8s-staging-ingress-nginx/e2e-test-echo:v20200627-ingress-nginx-2.9.0-11-g35e992fe0", 80, int32(replicas), nil, []corev1.VolumeMount{}, []corev1.Volume{}, @@ -343,7 +343,7 @@ func newDeployment(name, namespace, image string, port int32, replicas int32, co // NewHttpbinDeployment creates a new single replica deployment of the httpbin image in a particular namespace. func (f *Framework) NewHttpbinDeployment() { - f.NewDeployment(HTTPBinService, "ingress-controller/httpbin:1.0.0-dev", 80, 1) + f.NewDeployment(HTTPBinService, "gcr.io/k8s-staging-ingress-nginx/e2e-test-httpbin:v20200627-ingress-nginx-2.9.0-12-gfc91afac8", 80, 1) } // NewDeployment creates a new deployment in a particular namespace. diff --git a/test/e2e/framework/fastcgi_helloserver.go b/test/e2e/framework/fastcgi_helloserver.go index 216f63e33..7d0a1c2d1 100644 --- a/test/e2e/framework/fastcgi_helloserver.go +++ b/test/e2e/framework/fastcgi_helloserver.go @@ -58,7 +58,7 @@ func (f *Framework) NewNewFastCGIHelloServerDeploymentWithReplicas(replicas int3 Containers: []corev1.Container{ { Name: "fastcgi-helloserver", - Image: "ingress-controller/fastcgi-helloserver:1.0.0-dev", + Image: "gcr.io/k8s-staging-ingress-nginx/e2e-test-fastcgi-helloserver:v20200627-ingress-nginx-2.9.0-8-g1fcf4444c", Env: []corev1.EnvVar{}, Ports: []corev1.ContainerPort{ { diff --git a/test/e2e/run.sh b/test/e2e/run.sh index 94bc32129..8f378b408 100755 --- a/test/e2e/run.sh +++ b/test/e2e/run.sh @@ -76,27 +76,19 @@ echo "[dev-env] building image" make -C ${DIR}/../../ clean-image build image make -C ${DIR}/../e2e-image image -make -C ${DIR}/../../images/fastcgi-helloserver/ build image -make -C ${DIR}/../../images/httpbin/ image -make -C ${DIR}/../../images/echo/ image -make -C ${DIR}/../../images/cfssl/ image + +#make -C ${DIR}/../../images/fastcgi-helloserver/ build image +#make -C ${DIR}/../../images/echo/ image # Preload images used in e2e tests -docker pull moul/grpcbin -docker pull quay.io/kubernetes-ingress-controller/nginx:e3c49c52f4b74fe47ad65d6f3266a02e8b6b622f - KIND_WORKERS=$(kind get nodes --name="${KIND_CLUSTER_NAME}" | grep worker | awk '{printf (NR>1?",":"") $1}') echo "[dev-env] copying docker images to cluster..." kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} nginx-ingress-controller:e2e kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/nginx-ingress-controller:${TAG} -kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/fastcgi-helloserver:${TAG} -kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/httpbin:${TAG} -kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/echo:${TAG} -kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} quay.io/kubernetes-ingress-controller/nginx:e3c49c52f4b74fe47ad65d6f3266a02e8b6b622f -kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} moul/grpcbin -kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/cfssl:${TAG} +#kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/fastcgi-helloserver:${TAG} +#kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/echo:${TAG} echo "[dev-env] running e2e tests..." make -C ${DIR}/../../ e2e-test diff --git a/test/e2e/settings/ocsp/ocsp.go b/test/e2e/settings/ocsp/ocsp.go index df9007ab8..4c8eb7a23 100644 --- a/test/e2e/settings/ocsp/ocsp.go +++ b/test/e2e/settings/ocsp/ocsp.go @@ -302,7 +302,7 @@ func ocspserveDeployment(namespace string) (*appsv1.Deployment, *corev1.Service) Containers: []corev1.Container{ { Name: name, - Image: "ingress-controller/cfssl:1.0.0-dev", + Image: "gcr.io/k8s-staging-ingress-nginx/e2e-test-cfssl:v20200627-ingress-nginx-2.9.0-8-g1fcf4444c", Command: []string{ "/bin/bash", "-c",