From a830e931d53b81e0714ed2c606ba7b7682934c08 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Wed, 26 Feb 2020 14:23:42 -0300 Subject: [PATCH] Update go to 1.14 (#5173) --- .../images/ingress-controller/build-ingress-controller.sh | 2 +- build/images/nginx/build-nginx.sh | 2 +- images/e2e-prow/Dockerfile | 2 +- images/e2e-prow/Makefile | 2 +- images/e2e/Makefile | 7 +++++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build/images/ingress-controller/build-ingress-controller.sh b/build/images/ingress-controller/build-ingress-controller.sh index 8efb6f1cd..88d64c4d1 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.13.8)" +eval "$(gimme 1.14)" export GOPATH="/tmp/go" diff --git a/build/images/nginx/build-nginx.sh b/build/images/nginx/build-nginx.sh index 56f9e5323..77107fb31 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.13.8)" +eval "$(gimme 1.14)" git clone https://github.com/kubernetes/ingress-nginx diff --git a/images/e2e-prow/Dockerfile b/images/e2e-prow/Dockerfile index ca1d54b24..719d75f0a 100644 --- a/images/e2e-prow/Dockerfile +++ b/images/e2e-prow/Dockerfile @@ -62,7 +62,7 @@ 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.13.8 +ENV GO_VERSION 1.14 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 613031a48..2ae936d94 100644 --- a/images/e2e-prow/Makefile +++ b/images/e2e-prow/Makefile @@ -11,7 +11,7 @@ docker-build: --pull \ --load \ --build-arg K8S_RELEASE=v1.17.0 \ - --build-arg ETCD_VERSION=v3.3.15 \ + --build-arg ETCD_VERSION=v3.3.18 \ --build-arg KIND_VERSION=v0.7.0 \ -t $(IMAGE):$(TAG) . diff --git a/images/e2e/Makefile b/images/e2e/Makefile index 7d432b13e..aec294ab5 100644 --- a/images/e2e/Makefile +++ b/images/e2e/Makefile @@ -26,10 +26,13 @@ docker-build: --progress plain \ --build-arg K8S_RELEASE=v1.15.7 \ --build-arg ETCD_VERSION=v3.3.18 \ - --build-arg GOLANG_VERSION=1.13.8 \ - --build-arg GOLANG_SHA=b13bf04633d4d8cf53226ebeaace8d4d2fd07ae6fa676d0844a688339debec34 \ + --build-arg GOLANG_VERSION=1.14 \ + --build-arg GOLANG_SHA=6d643e46ad565058c7a39dac01144172ef9bd476521f42148be59249e4b74389 \ --build-arg RESTY_CLI_VERSION=0.25rc2 \ --build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \ + --build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \ + --build-arg YAML_LINT_VERSION=1.13.0 \ + --build-arg YAMALE_VERSION=1.8.0 \ -t $(IMAGE):$(TAG) . docker-push: