Skip to content

Commit

Permalink
golang: bump to 1.13.0
Browse files Browse the repository at this point in the history
- Bump golang to 1.13.0
- Bump golang.org/x to last commit available in release-branch.go1.13 of
such repositories.
- Update quay.io/cilium/cilium-runtime and quay.io/cilium/cilium-builder
versions.

Signed-off-by: André Martins <andre@cilium.io>
  • Loading branch information
aanm authored and tgraf committed Sep 9, 2019
1 parent dae94d3 commit c319403
Show file tree
Hide file tree
Showing 505 changed files with 100,321 additions and 10,673 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dist: trusty
sudo: required

go:
- 1.12.8
- 1.13

if: branch = master OR type = pull_request

Expand All @@ -17,6 +17,6 @@ before_install: ./.travis/prepare.sh

before_script:
- export PATH=/usr/local/clang/bin:$PATH
- export GO=/home/travis/.gimme/versions/go1.12.8.linux.amd64/bin/go
- export GO=/home/travis/.gimme/versions/go1.13.linux.amd64/bin/go

script: ./.travis/build.sh
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ FROM quay.io/cilium/cilium-envoy:feb9a25e46898a501d1f9e49e95e7efbb725fe02 as cil
# versions to be built while allowing the new versions to make changes
# that are not backwards compatible.
#
FROM quay.io/cilium/cilium-builder:2019-08-13 as builder
FROM quay.io/cilium/cilium-builder:2019-09-04 as builder
LABEL maintainer="maintainer@cilium.io"
WORKDIR /go/src/github.com/cilium/cilium
COPY . ./
Expand All @@ -37,7 +37,7 @@ RUN make LOCKDEBUG=$LOCKDEBUG PKG_BUILD=1 V=$V LIBNETWORK_PLUGIN=$LIBNETWORK_PLU
# built while allowing the new versions to make changes that are not
# backwards compatible.
#
FROM quay.io/cilium/cilium-runtime:2019-08-13
FROM quay.io/cilium/cilium-runtime:2019-09-04
LABEL maintainer="maintainer@cilium.io"
COPY --from=builder /tmp/install /
COPY --from=cilium-envoy / /
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ WORKDIR /go/src/github.com/cilium/cilium
ENV GOROOT /usr/local/go
ENV GOPATH /go
ENV PATH "$GOROOT/bin:$GOPATH/bin:$PATH"
ENV GO_VERSION 1.12.8
ENV GO_VERSION 1.13

#
# Build dependencies
Expand Down
13 changes: 7 additions & 6 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -442,17 +442,17 @@ required = [

[[override]]
name = "golang.org/x/crypto"
revision = "e84da0312774c21d64ee2317962ef669b27ffb41"
revision = "60c769a6c58655dab1b9adac0d58967dd517cfba"

# main-usage = "only in integration tests"
# on-revision = ""

[[override]]
name = "golang.org/x/net"
revision = "65e2d4e15006aab9813ff8769e768bbf4bb667a0"
revision = "74dc4d7220e7acc4e100824340f3e66577424772"

# main-usage = "pkg/kvstore/etcd, pkg/workloads, pkg/envoy and api/v1"
# on-revision = "last revision of branch 1.12"
# on-revision = "last revision of branch 1.13"

[[constraint]]
name = "golang.org/x/sync"
Expand All @@ -463,7 +463,7 @@ required = [

[[override]]
name = "golang.org/x/sys"
revision = "98c5dad5d1a0e8a73845ecc8897d0bd56586511d"
revision = "fde4db37ae7ad8191b03d30d27f258b5291ae4e3"

# main-usage = "daemon, pkg/bpf, pkg/maps/ipcache"
# on-revision = "github.com/shirou/gopsutil uses master so we override it with a particullar commit after v2.18.10 was released"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ JOB_BASE_NAME ?= cilium_test

UTC_DATE=$(shell date -u "+%Y-%m-%d")

GO_VERSION := 1.12.8
GO_VERSION := 1.13.0

# Since there's a bug with NFS or the kernel, the flock syscall hangs the documentation
# build in the developer VM. For this reason the documentation build is skipped if NFS
Expand Down
2 changes: 1 addition & 1 deletion cilium-docker-plugin.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/golang:1.12.8 as builder
FROM docker.io/library/golang:1.13.0 as builder
LABEL maintainer="maintainer@cilium.io"
ADD . /go/src/github.com/cilium/cilium
WORKDIR /go/src/github.com/cilium/cilium/plugins/cilium-docker
Expand Down
2 changes: 1 addition & 1 deletion cilium-operator.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/golang:1.12.8 as builder
FROM docker.io/library/golang:1.13.0 as builder
LABEL maintainer="maintainer@cilium.io"
ADD . /go/src/github.com/cilium/cilium
WORKDIR /go/src/github.com/cilium/cilium/operator
Expand Down
2 changes: 1 addition & 1 deletion contrib/packaging/docker/Dockerfile.runtime
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ apt-get clean
#
# Go-based tools we need at runtime
#
FROM docker.io/library/golang:1.12.8 as runtime-gobuild
FROM docker.io/library/golang:1.13.0 as runtime-gobuild
WORKDIR /tmp
RUN go get -d github.com/google/gops && \
cd /go/src/github.com/google/gops && \
Expand Down
2 changes: 1 addition & 1 deletion test/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
command: "etcd -name etcd0 -advertise-client-urls http://0.0.0.0:4002 -listen-client-urls http://0.0.0.0:4002 -initial-cluster-token etcd-cluster-1 -initial-cluster-state new"
privileged: true
base_image:
image: "quay.io/cilium/cilium-builder:2019-08-13"
image: "quay.io/cilium/cilium-builder:2019-09-04"
volumes:
- "./../:/go/src/github.com/cilium/cilium/"
privileged: true
Expand Down
2 changes: 1 addition & 1 deletion vendor/golang.org/x/crypto/curve25519/curve25519.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 45 additions & 45 deletions vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c319403

Please sign in to comment.