DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4221 from aledbf/upgrade-nginx-image

Browse source 
Switch to openresty image
This commit is contained in:
Kubernetes Prow Robot 2019-06-24 09:45:57 -07:00 • committed by GitHub
commit 5dfc7e211f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 43 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/e2e-image/Dockerfile
View file

@ -1,4 +1,4 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v06042019-0c7a34696 AS BASE
FROM quay.io/kubernetes-ingress-controller/e2e:v06232019-5bb168152 AS BASE
FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
@ -9,7 +9,7 @@ RUN clean-install \
tzdata
RUN curl -Lo /usr/local/bin/kubectl \
https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl \
https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/amd64/kubectl \
&& chmod +x /usr/local/bin/kubectl
COPY --from=BASE /go/bin/ginkgo /usr/local/bin/

2
test/e2e-prow/Dockerfile
View file

@ -56,7 +56,7 @@ RUN curl -L https://storage.googleapis.com/etcd/${ETCD_VERSION}/etcd-${ETCD_VERS
&& rm -rf /tmp/etcd-download
# install go
ENV GO_VERSION 1.12.5
ENV GO_VERSION 1.12.6
ENV GO_TARBALL "go${GO_VERSION}.linux-amd64.tar.gz"
RUN wget -q "https://storage.googleapis.com/golang/${GO_TARBALL}" && \
tar xzf "${GO_TARBALL}" -C /usr/local && \

2
test/e2e-prow/Makefile
View file

@ -9,7 +9,7 @@ all: docker-build docker-push
docker-build:
$(DOCKER) build \
--pull \
--build-arg K8S_RELEASE=v1.14.1 \
--build-arg K8S_RELEASE=v1.15.0 \
--build-arg ETCD_VERSION=v3.3.12 \
-t $(IMAGE):$(TAG) .

4
test/e2e/annotations/redirect.go
View file

@ -72,7 +72,7 @@ var _ = framework.IngressNginxDescribe("Annotations - Redirect", func() {
Expect(errs).To(BeNil())
Expect(resp.StatusCode).Should(BeNumerically("==", http.StatusMovedPermanently))
Expect(resp.Header.Get("Location")).Should(Equal(redirectURL))
Expect(body).Should(ContainSubstring("nginx/"))
Expect(body).Should(ContainSubstring("openresty/"))
})
It("should respond with a custom redirect code", func() {
@ -108,6 +108,6 @@ var _ = framework.IngressNginxDescribe("Annotations - Redirect", func() {
Expect(errs).To(BeNil())
Expect(resp.StatusCode).Should(BeNumerically("==", redirectCode))
Expect(resp.Header.Get("Location")).Should(Equal(redirectURL))
Expect(body).Should(ContainSubstring("nginx/"))
Expect(body).Should(ContainSubstring("openresty/"))
})
})

14
test/e2e/framework/framework.go
View file

@ -128,6 +128,20 @@ func (f *Framework) AfterEach() {
Expect(err).ToNot(HaveOccurred())
By("Dumping NGINX logs after a failure running a test")
Logf("%v", log)
pod, err := getIngressNGINXPod(f.Namespace, f.KubeClientSet)
if err != nil {
return
}
cmd := fmt.Sprintf("cat /etc/nginx/nginx.conf")
o, err := f.ExecCommand(pod, cmd)
if err != nil {
return
}
By("Dumping NGINX configuration after a failure running a test")
Logf("%v", o)
}
}