diff --git a/build/images/ingress-controller/build-ingress-controller.sh b/build/images/ingress-controller/build-ingress-controller.sh index 00cb6b46c..dbc18fac0 100644 --- a/build/images/ingress-controller/build-ingress-controller.sh +++ b/build/images/ingress-controller/build-ingress-controller.sh @@ -67,7 +67,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme chmod +x /usr/local/bin/gimme -eval "$(gimme 1.14.1)" +eval "$(gimme 1.14.2)" export GOPATH="/tmp/go" diff --git a/build/images/nginx/build-nginx.sh b/build/images/nginx/build-nginx.sh index 13c43bfa9..d3100e2f3 100644 --- a/build/images/nginx/build-nginx.sh +++ b/build/images/nginx/build-nginx.sh @@ -70,7 +70,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme chmod +x /usr/local/bin/gimme -eval "$(gimme 1.14.1)" +eval "$(gimme 1.14.2)" git clone https://github.com/kubernetes/ingress-nginx diff --git a/images/e2e-prow/Dockerfile b/images/e2e-prow/Dockerfile index 7f7a61877..ae05fc7a4 100644 --- a/images/e2e-prow/Dockerfile +++ b/images/e2e-prow/Dockerfile @@ -45,6 +45,7 @@ RUN apt-get update \ ARG K8S_RELEASE ARG ETCD_VERSION ARG KIND_VERSION +ARG GO_VERSION RUN curl -sSL https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \ && chmod +x /usr/local/bin/kubectl @@ -62,7 +63,6 @@ RUN curl -sSL https://github.com/kubernetes-sigs/kind/releases/download/${KIND_V && chmod +x /usr/local/bin/kind # install go -ENV GO_VERSION 1.14.1 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 \ diff --git a/images/e2e-prow/Makefile b/images/e2e-prow/Makefile index 2ae936d94..bc70fb7aa 100644 --- a/images/e2e-prow/Makefile +++ b/images/e2e-prow/Makefile @@ -13,6 +13,7 @@ docker-build: --build-arg K8S_RELEASE=v1.17.0 \ --build-arg ETCD_VERSION=v3.3.18 \ --build-arg KIND_VERSION=v0.7.0 \ + --build-arg GOLANG_VERSION=1.14.2 \ -t $(IMAGE):$(TAG) . docker-push: diff --git a/images/e2e/Makefile b/images/e2e/Makefile index 38021c25c..65be68de3 100644 --- a/images/e2e/Makefile +++ b/images/e2e/Makefile @@ -26,8 +26,8 @@ docker-build: --progress plain \ --build-arg K8S_RELEASE=v1.15.7 \ --build-arg ETCD_VERSION=v3.3.18 \ - --build-arg GOLANG_VERSION=1.14.1 \ - --build-arg GOLANG_SHA=2ad2572115b0d1b4cb4c138e6b3a31cee6294cb48af75ee86bec3dca04507676 \ + --build-arg GOLANG_VERSION=1.14.2 \ + --build-arg GOLANG_SHA=98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c \ --build-arg RESTY_CLI_VERSION=0.25rc2 \ --build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \ --build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \