diff --git a/Makefile b/Makefile index a260c05d5..8a449ede8 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ endif REGISTRY ?= gcr.io/k8s-staging-ingress-nginx -BASE_IMAGE ?= k8s.gcr.io/ingress-nginx/nginx:v20210324-g8baef769d@sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6 +BASE_IMAGE ?= k8s.gcr.io/ingress-nginx/nginx:v20210530-g6aab4c291@sha256:a7356029dd0c26cc3466bf7a27daec0f4df73aa14ca6c8b871a767022a812c0b GOARCH=$(ARCH) diff --git a/images/nginx/rc.yaml b/images/nginx/rc.yaml index c9fb2f81a..8a6bec91c 100644 --- a/images/nginx/rc.yaml +++ b/images/nginx/rc.yaml @@ -38,7 +38,7 @@ spec: spec: containers: - name: nginx - image: k8s.gcr.io/ingress-nginx/nginx:v20210324-g8baef769d@sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6 + image: k8s.gcr.io/ingress-nginx/nginx:v20210530-g6aab4c291@sha256:a7356029dd0c26cc3466bf7a27daec0f4df73aa14ca6c8b871a767022a812c0b ports: - containerPort: 80 - containerPort: 443 diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile index cb0a82b6b..752596c2d 100644 --- a/images/test-runner/Makefile +++ b/images/test-runner/Makefile @@ -23,6 +23,8 @@ REGISTRY ?= local IMAGE = $(REGISTRY)/e2e-test-runner +NGINX_BASE_IMAGE ?= k8s.gcr.io/ingress-nginx/nginx:v20210530-g6aab4c291@sha256:a7356029dd0c26cc3466bf7a27daec0f4df73aa14ca6c8b871a767022a812c0b + # required to enable buildx export DOCKER_CLI_EXPERIMENTAL=enabled @@ -36,7 +38,7 @@ build: ensure-buildx --platform=${PLATFORMS} $(OUTPUT) \ --progress=$(PROGRESS) \ --pull \ - --build-arg BASE_IMAGE=k8s.gcr.io/ingress-nginx/nginx:v20210324-g8baef769d@sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6 \ + --build-arg BASE_IMAGE=$(NGINX_BASE_IMAGE) \ --build-arg GOLANG_VERSION=1.15.6 \ --build-arg ETCD_VERSION=3.4.3-0 \ --build-arg K8S_RELEASE=v1.19.4 \ diff --git a/test/e2e/framework/deployment.go b/test/e2e/framework/deployment.go index 726897dc9..8725e9950 100644 --- a/test/e2e/framework/deployment.go +++ b/test/e2e/framework/deployment.go @@ -37,6 +37,9 @@ const SlowEchoService = "slow-echo" // HTTPBinService name of the deployment for the httpbin app const HTTPBinService = "httpbin" +// NginxBaseImage use for testing +const NginxBaseImage = "k8s.gcr.io/ingress-nginx/nginx:v20210530-g6aab4c291@sha256:a7356029dd0c26cc3466bf7a27daec0f4df73aa14ca6c8b871a767022a812c0b" + // NewEchoDeployment creates a new single replica deployment of the echoserver image in a particular namespace func (f *Framework) NewEchoDeployment() { f.NewEchoDeploymentWithReplicas(1) @@ -139,7 +142,7 @@ func (f *Framework) NGINXWithConfigDeployment(name string, cfg string) { }, metav1.CreateOptions{}) assert.Nil(ginkgo.GinkgoT(), err, "creating configmap") - deployment := newDeployment(name, f.Namespace, "k8s.gcr.io/ingress-nginx/nginx:v20210324-g8baef769d@sha256:fcfa3e9d1f8ec3141efedbf77cf659640f452a9c22165c78006ea462b84d06f6", 80, 1, + deployment := newDeployment(name, f.Namespace, NginxBaseImage, 80, 1, nil, []corev1.VolumeMount{ {