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

Update go to 1.12.5, kubectl to 1.14.1 and kind to 0.2.1 (#4064)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2019-05-06 23:28:15 -04:00 committed by GitHub
parent b4f2880ee6
commit b8fb09d7b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -45,8 +45,8 @@ jobs:
if: (branch = master AND env(COMPONENT) != "docs") OR (type = pull_request AND commit_message !~ /(skip-e2e)/)
before_script:
- sudo mkdir -p /home/travis/.kube/ && sudo chmod 777 /home/travis/.kube/
- curl -sSL -o kubectl https://storage.googleapis.com/kubernetes-release/release/v1.13.4/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
- curl -sSL -o kind https://github.com/kubernetes-sigs/kind/releases/download/0.2.0/kind-linux-amd64 && chmod +x kind && sudo mv kind /usr/local/bin/
- curl -sSL -o kubectl https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
- curl -sSL -o kind https://github.com/kubernetes-sigs/kind/releases/download/0.2.1/kind-linux-amd64 && chmod +x kind && sudo mv kind /usr/local/bin/
- make e2e-test-image
script:
- test/e2e/run.sh

2
build/go-in-docker.sh
View file

@ -40,7 +40,7 @@ if [ "$missing" = true ];then
exit 1
fi
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04172019-3fa3923cb
E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v05062019-b4f2880ee
DOCKER_OPTS=${DOCKER_OPTS:-""}

6
images/e2e/Dockerfile
View file

@ -25,9 +25,9 @@ RUN clean-install \
python \
pkg-config
ENV GOLANG_VERSION 1.12.4
ENV GOLANG_VERSION 1.12.5
ENV GO_ARCH linux-amd64
ENV GOLANG_SHA d7d1f1f88ddfe55840712dc1747f37a790cbcaa448f6c9cf51bbe10aa65442f5
ENV GOLANG_SHA aea86e3c73495f205929cfebba0d63f1382c8ac59be081b6351681415f4063cf
RUN set -eux; \
url="https://golang.org/dl/go${GOLANG_VERSION}.${GO_ARCH}.tar.gz"; \
@ -63,5 +63,5 @@ RUN luarocks install luacheck \
RUN go get github.com/onsi/ginkgo/ginkgo \
&& go get golang.org/x/lint/golint
RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.13.3/bin/linux/amd64/kubectl \
RUN curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl \
&& chmod +x /usr/local/bin/kubectl

4
test/e2e-image/Dockerfile
View file

@ -1,4 +1,4 @@
FROM quay.io/kubernetes-ingress-controller/e2e:v04172019-3fa3923cb AS BASE
FROM quay.io/kubernetes-ingress-controller/e2e:v05062019-b4f2880ee 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.13.3/bin/linux/amd64/kubectl \
https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl \
&& chmod +x /usr/local/bin/kubectl
COPY --from=BASE /go/bin/ginkgo /usr/local/bin/