Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.8: Update Go to 1.14.10 #13579

Merged
merged 1 commit into from
Oct 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/go-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: go
dist: bionic
sudo: required

go: "1.14.9"
go: "1.14.10"

arch:
- amd64
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.builder
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion GO_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.14.9
1.14.10
2 changes: 1 addition & 1 deletion cilium-dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cilium-docker-plugin.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cilium-operator-aws.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions cilium-operator-azure.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions cilium-operator-generic.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions cilium-operator.Dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 && \
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 @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions hubble-relay.Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 && \
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: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
Expand Down
2 changes: 1 addition & 1 deletion test/kubernetes-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/packet/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down