Skip to content

Commit

Permalink
Update go to 1.14
Browse files Browse the repository at this point in the history
  • Loading branch information
aledbf committed Feb 26, 2020
1 parent f48774e commit 7394084
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion build/images/nginx/build-nginx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion images/e2e-prow/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion images/e2e-prow/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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) .

Expand Down
7 changes: 5 additions & 2 deletions images/e2e/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 7394084

Please sign in to comment.