Update Go to 1.14.10

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
cilium · Oct 16, 2020 · cbb3a84 · cbb3a84
1 parent ab575b1
commit cbb3a84
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/go-check.yaml b/.github/workflows/go-check.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14.9
+          go-version: 1.14.10
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Check module vendoring
@@ -28,7 +28,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14.9
+          go-version: 1.14.10
       - name: Checkout code
         uses: actions/checkout@v2
         with:

diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: go
 dist: bionic
 sudo: required
 
-go: "1.14.9"
+go: "1.14.10"
 
 arch:
   - amd64

diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,7 @@ LABEL cilium-sha=${CILIUM_SHA}
 # versions to be built while allowing the new versions to make changes
 # that are not backwards compatible.
 #
-FROM quay.io/cilium/cilium-builder:2020-09-10-v1.8@sha256:7939d642ce1891e41bda33135222f8f83ab873a80cee8ec8eef68369ca25316c as builder
+FROM quay.io/cilium/cilium-builder:2020-10-15-v1.8@sha256:5f2e2e4cb4b86525f23cc183ffabb0297060b269f830377a548ea60c058951f9 as builder
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 LABEL maintainer="maintainer@cilium.io"
@@ -50,7 +50,7 @@ RUN make NOSTRIP=$NOSTRIP LOCKDEBUG=$LOCKDEBUG PKG_BUILD=1 V=$V LIBNETWORK_PLUGI
 # built while allowing the new versions to make changes that are not
 # backwards compatible.
 #
-FROM quay.io/cilium/cilium-runtime:2020-09-10-v1.8@sha256:9cac41f6b8482e614850aa0c4e260e879e9b29c3e8711d231aeb4edc6218099b
+FROM quay.io/cilium/cilium-runtime:2020-10-15-v1.8@sha256:b044609290ecd3c82c8a8507708d96f0648ab1d22a8b75b2040e285e8556b602
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 LABEL maintainer="maintainer@cilium.io"

diff --git a/Dockerfile.builder b/Dockerfile.builder
@@ -1,7 +1,7 @@
 #
 # Cilium build-time base image (image created from this file is used to build Cilium)
 #
-FROM quay.io/cilium/cilium-runtime:2020-09-10-v1.8@sha256:9cac41f6b8482e614850aa0c4e260e879e9b29c3e8711d231aeb4edc6218099b
+FROM quay.io/cilium/cilium-runtime:2020-10-15-v1.8@sha256:b044609290ecd3c82c8a8507708d96f0648ab1d22a8b75b2040e285e8556b602
 LABEL maintainer="maintainer@cilium.io"
 ARG ARCH=amd64
 WORKDIR /go/src/github.com/cilium/cilium
@@ -12,7 +12,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.14.9
+ENV GO_VERSION 1.14.10
 
 #
 # Build dependencies

diff --git a/GO_VERSION b/GO_VERSION
@@ -1 +1 @@
-1.14.9
+1.14.10
diff --git a/cilium-dev.Dockerfile b/cilium-dev.Dockerfile
@@ -3,7 +3,7 @@
 # development environmennt
 FROM quay.io/cilium/cilium-envoy:63de0bd958d05d82e2396125dcf6286d92464c56 as cilium-envoy
 
-FROM quay.io/cilium/cilium-runtime:2020-09-10-v1.8@sha256:9cac41f6b8482e614850aa0c4e260e879e9b29c3e8711d231aeb4edc6218099b
+FROM quay.io/cilium/cilium-runtime:2020-10-15-v1.8@sha256:b044609290ecd3c82c8a8507708d96f0648ab1d22a8b75b2040e285e8556b602
 LABEL maintainer="maintainer@cilium.io"
 RUN apt-get update && apt-get install make -y
 WORKDIR /go/src/github.com/cilium/cilium

diff --git a/cilium-docker-plugin.Dockerfile b/cilium-docker-plugin.Dockerfile
@@ -1,6 +1,6 @@
 # (first line comment needed for DOCKER_BUILDKIT use)
 #
-FROM docker.io/library/golang:1.14.9 as builder
+FROM docker.io/library/golang:1.14.10 as builder
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 LABEL maintainer="maintainer@cilium.io"

diff --git a/cilium-operator-aws.Dockerfile b/cilium-operator-aws.Dockerfile
@@ -1,6 +1,6 @@
 # (first line comment needed for DOCKER_BUILDKIT use)
 #
-FROM docker.io/library/golang:1.14.9 as builder
+FROM docker.io/library/golang:1.14.10 as builder
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 LABEL maintainer="maintainer@cilium.io"
@@ -17,7 +17,7 @@ ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 RUN apk --update add ca-certificates
 
-FROM docker.io/library/golang:1.14.9 as gops
+FROM docker.io/library/golang:1.14.10 as gops
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 RUN go get -d github.com/google/gops && \

diff --git a/cilium-operator-azure.Dockerfile b/cilium-operator-azure.Dockerfile
@@ -1,6 +1,6 @@
 # (first line comment needed for DOCKER_BUILDKIT use)
 #
-FROM docker.io/library/golang:1.14.9 as builder
+FROM docker.io/library/golang:1.14.10 as builder
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 LABEL maintainer="maintainer@cilium.io"
@@ -17,7 +17,7 @@ ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 RUN apk --update add ca-certificates
 
-FROM docker.io/library/golang:1.14.9 as gops
+FROM docker.io/library/golang:1.14.10 as gops
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 RUN go get -d github.com/google/gops && \

diff --git a/cilium-operator-generic.Dockerfile b/cilium-operator-generic.Dockerfile
@@ -1,6 +1,6 @@
 # (first line comment needed for DOCKER_BUILDKIT use)
 #
-FROM docker.io/library/golang:1.14.9 as builder
+FROM docker.io/library/golang:1.14.10 as builder
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 LABEL maintainer="maintainer@cilium.io"
@@ -17,7 +17,7 @@ ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 RUN apk --update add ca-certificates
 
-FROM docker.io/library/golang:1.14.9 as gops
+FROM docker.io/library/golang:1.14.10 as gops
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 RUN go get -d github.com/google/gops && \

diff --git a/cilium-operator.Dockerfile b/cilium-operator.Dockerfile
@@ -1,6 +1,6 @@
 # (first line comment needed for DOCKER_BUILDKIT use)
 #
-FROM docker.io/library/golang:1.14.9 as builder
+FROM docker.io/library/golang:1.14.10 as builder
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 LABEL maintainer="maintainer@cilium.io"
@@ -17,7 +17,7 @@ ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 RUN apk --update add ca-certificates
 
-FROM docker.io/library/golang:1.14.9 as gops
+FROM docker.io/library/golang:1.14.10 as gops
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 RUN go get -d github.com/google/gops && \

diff --git a/contrib/packaging/docker/Dockerfile.runtime b/contrib/packaging/docker/Dockerfile.runtime
@@ -28,7 +28,7 @@ RUN update-alternatives \
 #
 # Go-based tools for runtime image
 #
-FROM docker.io/library/golang:1.14.9 as gops
+FROM docker.io/library/golang:1.14.10 as gops
 WORKDIR /tmp
 RUN go get -d github.com/google/gops && \
     cd /go/src/github.com/google/gops && \

diff --git a/hubble-relay.Dockerfile b/hubble-relay.Dockerfile
@@ -1,6 +1,6 @@
 # (first line comment needed for DOCKER_BUILDKIT use)
 #
-FROM docker.io/library/golang:1.14.9 as builder
+FROM docker.io/library/golang:1.14.10 as builder
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 ADD . /go/src/github.com/cilium/cilium
@@ -13,7 +13,7 @@ ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 RUN apk --update add ca-certificates
 
-FROM docker.io/library/golang:1.14.9 as gops
+FROM docker.io/library/golang:1.14.10 as gops
 ARG CILIUM_SHA=""
 LABEL cilium-sha=${CILIUM_SHA}
 RUN go get -d github.com/google/gops && \

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -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:2020-09-10-v1.8@sha256:7939d642ce1891e41bda33135222f8f83ab873a80cee8ec8eef68369ca25316c"
+    image: "quay.io/cilium/cilium-builder:2020-10-15-v1.8@sha256:5f2e2e4cb4b86525f23cc183ffabb0297060b269f830377a548ea60c058951f9"
     volumes:
       - "./../:/go/src/github.com/cilium/cilium/"
     privileged: true

diff --git a/test/kubernetes-test.sh b/test/kubernetes-test.sh
@@ -62,7 +62,7 @@ git clone https://github.com/kubernetes/kubernetes.git -b ${KUBERNETES_VERSION}
 cd kubernetes
 
 # Kubernetes is only compiling with golang 1.13.4 for versions >=1.17
-GO_VERSION="1.14.9"
+GO_VERSION="1.14.10"
 sudo rm -fr /usr/local/go
 curl -LO https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz
 sudo tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz

diff --git a/test/packet/scripts/install.sh b/test/packet/scripts/install.sh
@@ -5,7 +5,7 @@ set -e
 # Ensure no prompts from apt & co.
 export DEBIAN_FRONTEND=noninteractive
 
-GOLANG_VERSION="1.14.9"
+GOLANG_VERSION="1.14.10"
 VAGRANT_VERSION="2.2.4"
 PACKER_VERSION="1.3.5"
 VIRTUALBOX_VERSION="6.0"