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

Update Go to 1.17.2 #17565

Merged
merged 1 commit into from
Oct 12, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-images-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:latest-race
quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race
build-args: |
BASE_IMAGE=quay.io/cilium/cilium-runtime:1c8fec489280b3bd67ad44835cf3028bbf6ab207@sha256:1aea8577f3991b58ed6629685080b4002604d20ed0b2664596fa598ed4cfc03d
BASE_IMAGE=quay.io/cilium/cilium-runtime:92c3c32e5b9cbd820e84925f0096298ddd893a46@sha256:81fee311428ccfce3dfb9d3ed5cba06db3995174b73937db416ab3fdc570decd
LOCKDEBUG=1
RACE=1
OPERATOR_VARIANT=${{ matrix.name }}
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
tags: |
quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race
build-args: |
BASE_IMAGE=quay.io/cilium/cilium-runtime:1c8fec489280b3bd67ad44835cf3028bbf6ab207@sha256:1aea8577f3991b58ed6629685080b4002604d20ed0b2664596fa598ed4cfc03d
BASE_IMAGE=quay.io/cilium/cilium-runtime:92c3c32e5b9cbd820e84925f0096298ddd893a46@sha256:81fee311428ccfce3dfb9d3ed5cba06db3995174b73937db416ab3fdc570decd
LOCKDEBUG=1
RACE=1
OPERATOR_VARIANT=${{ matrix.name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-bpf-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@331ce1d993939866bb63c32c6cbbfd48fa76fc57
with:
go-version: 1.17.1
go-version: 1.17.2
- name: Cache LLVM and Clang
id: cache-llvm
uses: actions/cache@c64c572235d810460d0d6876e9c705ad5002b353
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-build-commits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@331ce1d993939866bb63c32c6cbbfd48fa76fc57
with:
go-version: 1.17.1
go-version: 1.17.2

- name: Cache LLVM and Clang
id: cache-llvm
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/lint-go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@331ce1d993939866bb63c32c6cbbfd48fa76fc57
with:
go-version: 1.17.1
go-version: 1.17.2
- name: Checkout code
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
Expand All @@ -46,7 +46,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@331ce1d993939866bb63c32c6cbbfd48fa76fc57
with:
go-version: 1.17.1
go-version: 1.17.2
- name: Checkout code
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
Expand All @@ -71,7 +71,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@331ce1d993939866bb63c32c6cbbfd48fa76fc57
with:
go-version: 1.17.1
go-version: 1.17.2
- name: Checkout code
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
Expand All @@ -97,7 +97,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@331ce1d993939866bb63c32c6cbbfd48fa76fc57
with:
go-version: 1.17.1
go-version: 1.17.2
- name: Checkout code
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
Expand All @@ -123,7 +123,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@331ce1d993939866bb63c32c6cbbfd48fa76fc57
with:
go-version: 1.17.1
go-version: 1.17.2
- name: Checkout code
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
with:
Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: go
dist: focal
sudo: required

go: "1.17.1"
go: "1.17.2"

jobs:
include:
Expand All @@ -16,14 +16,14 @@ jobs:
if: type != pull_request
env:
- RACE=1
- BASE_IMAGE=quay.io/cilium/cilium-runtime:1c8fec489280b3bd67ad44835cf3028bbf6ab207@sha256:1aea8577f3991b58ed6629685080b4002604d20ed0b2664596fa598ed4cfc03d
- BASE_IMAGE=quay.io/cilium/cilium-runtime:92c3c32e5b9cbd820e84925f0096298ddd893a46@sha256:81fee311428ccfce3dfb9d3ed5cba06db3995174b73937db416ab3fdc570decd
- LOCKDEBUG=1
- arch: arm64-graviton2
name: "arm64-graviton2-race"
if: type != pull_request
env:
- RACE=1
- BASE_IMAGE=quay.io/cilium/cilium-runtime:1c8fec489280b3bd67ad44835cf3028bbf6ab207@sha256:1aea8577f3991b58ed6629685080b4002604d20ed0b2664596fa598ed4cfc03d
- BASE_IMAGE=quay.io/cilium/cilium-runtime:92c3c32e5b9cbd820e84925f0096298ddd893a46@sha256:81fee311428ccfce3dfb9d3ed5cba06db3995174b73937db416ab3fdc570decd
- LOCKDEBUG=1
virt: vm
group: edge
Expand Down
2 changes: 1 addition & 1 deletion GO_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17.1
1.17.2
2 changes: 1 addition & 1 deletion api/v1/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
include ../../Makefile.defs

# Update this via images/scripts/update-cilium-builder-image.sh
CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:93dc1e5dfed6c3cbe07a4ec784e0700328d869a6@sha256:94c24d3bf0fd640406bf19a5806ab66fb43f552617116bd2b36d3faaff94c921
CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:e83adad6f522d961c6e77200a4594a6705cb1723@sha256:8ca398fb6d7a88fe693221529694a600545c7f91e1c1474768265edbc161886d

.PHONY: proto
proto:
Expand Down
4 changes: 2 additions & 2 deletions images/builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# SPDX-License-Identifier: Apache-2.0

ARG COMPILERS_IMAGE=quay.io/cilium/image-compilers:6ed96e618f68cd941b62b546fc8d161db0144d84@sha256:5245610a830b14972d5b287fc0318ac6ab0d420e4afc9b5db9032a04fd706d32
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:1c8fec489280b3bd67ad44835cf3028bbf6ab207@sha256:1aea8577f3991b58ed6629685080b4002604d20ed0b2664596fa598ed4cfc03d
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:92c3c32e5b9cbd820e84925f0096298ddd893a46@sha256:81fee311428ccfce3dfb9d3ed5cba06db3995174b73937db416ab3fdc570decd
ARG TESTER_IMAGE=quay.io/cilium/image-tester:eb76f0d4d585946bb0267b4c4478cceed17bbd87@sha256:c9a598cdc4843e62ab4e430f36343ca06d5292506261f17e466e0f1cbb48ddbb
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.1@sha256:6bf3a48a203d230b5e4cab749d44a0d8d51905c023f1ebe29927cffa43061f2c
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.2@sha256:45d45a39258425b0386643efc863b3b3c1481173d64ec6151b18d48b565df9a0
ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:0147a23fdada32bd51b4f313c645bcb5fbe188d6@sha256:24fd3ad32471d0e45844c856c38f1b2d4ac8bd0a2d4edf64cffaaa3fd0b21202

FROM ${COMPILERS_IMAGE} as compilers-image
Expand Down
2 changes: 1 addition & 1 deletion images/cilium-docker-plugin/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_IMAGE=scratch
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.1@sha256:6bf3a48a203d230b5e4cab749d44a0d8d51905c023f1ebe29927cffa43061f2c
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.2@sha256:45d45a39258425b0386643efc863b3b3c1481173d64ec6151b18d48b565df9a0

# BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
# Represents the plataform where the build is happening, do not mix with
Expand Down
2 changes: 1 addition & 1 deletion images/cilium-test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright 2020-2021 Authors of Cilium
# SPDX-License-Identifier: Apache-2.0

ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:93dc1e5dfed6c3cbe07a4ec784e0700328d869a6@sha256:94c24d3bf0fd640406bf19a5806ab66fb43f552617116bd2b36d3faaff94c921
ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:e83adad6f522d961c6e77200a4594a6705cb1723@sha256:8ca398fb6d7a88fe693221529694a600545c7f91e1c1474768265edbc161886d
ARG UBUNTU_IMAGE=docker.io/library/ubuntu:20.04@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93

FROM ${UBUNTU_IMAGE} as rootfs
Expand Down
4 changes: 2 additions & 2 deletions images/cilium/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Copyright 2020-2021 Authors of Cilium
# SPDX-License-Identifier: Apache-2.0

ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:93dc1e5dfed6c3cbe07a4ec784e0700328d869a6@sha256:94c24d3bf0fd640406bf19a5806ab66fb43f552617116bd2b36d3faaff94c921
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:1c8fec489280b3bd67ad44835cf3028bbf6ab207@sha256:1aea8577f3991b58ed6629685080b4002604d20ed0b2664596fa598ed4cfc03d
ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:e83adad6f522d961c6e77200a4594a6705cb1723@sha256:8ca398fb6d7a88fe693221529694a600545c7f91e1c1474768265edbc161886d
ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:92c3c32e5b9cbd820e84925f0096298ddd893a46@sha256:81fee311428ccfce3dfb9d3ed5cba06db3995174b73937db416ab3fdc570decd

# cilium-envoy from github.com/cilium/proxy
#
Expand Down
2 changes: 1 addition & 1 deletion images/clustermesh-apiserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_IMAGE=scratch
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.1@sha256:6bf3a48a203d230b5e4cab749d44a0d8d51905c023f1ebe29927cffa43061f2c
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.2@sha256:45d45a39258425b0386643efc863b3b3c1481173d64ec6151b18d48b565df9a0
ARG ALPINE_IMAGE=docker.io/library/alpine:3.12.7@sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad

# BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
Expand Down
2 changes: 1 addition & 1 deletion images/hubble-relay/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_IMAGE=scratch
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.1@sha256:6bf3a48a203d230b5e4cab749d44a0d8d51905c023f1ebe29927cffa43061f2c
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.2@sha256:45d45a39258425b0386643efc863b3b3c1481173d64ec6151b18d48b565df9a0
ARG ALPINE_IMAGE=docker.io/library/alpine:3.12.7@sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad

# BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
Expand Down
2 changes: 1 addition & 1 deletion images/operator/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG BASE_IMAGE=scratch
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.1@sha256:6bf3a48a203d230b5e4cab749d44a0d8d51905c023f1ebe29927cffa43061f2c
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.2@sha256:45d45a39258425b0386643efc863b3b3c1481173d64ec6151b18d48b565df9a0
ARG ALPINE_IMAGE=docker.io/library/alpine:3.12.7@sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad

# BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0

ARG TESTER_IMAGE=quay.io/cilium/image-tester:eb76f0d4d585946bb0267b4c4478cceed17bbd87@sha256:c9a598cdc4843e62ab4e430f36343ca06d5292506261f17e466e0f1cbb48ddbb
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.1@sha256:6bf3a48a203d230b5e4cab749d44a0d8d51905c023f1ebe29927cffa43061f2c
ARG GOLANG_IMAGE=docker.io/library/golang:1.17.2@sha256:45d45a39258425b0386643efc863b3b3c1481173d64ec6151b18d48b565df9a0
ARG UBUNTU_IMAGE=docker.io/library/ubuntu:20.04@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93

ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:0147a23fdada32bd51b4f313c645bcb5fbe188d6@sha256:24fd3ad32471d0e45844c856c38f1b2d4ac8bd0a2d4edf64cffaaa3fd0b21202
Expand Down
2 changes: 1 addition & 1 deletion images/scripts/update-golang-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ root_dir="$(git rev-parse --show-toplevel)"

cd "${root_dir}"

go_version=1.17.1
go_version=1.17.2

image="${1:-docker.io/library/golang:${go_version}}"
image_digest="$("${script_dir}/get-image-digest.sh" "${image}")"
Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/ginkgo-gke.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ pipeline {
env.DOCKER_TAG = env.DOCKER_TAG + "-race"
env.RACE = 1
env.LOCKDEBUG = 1
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:1c8fec489280b3bd67ad44835cf3028bbf6ab207@sha256:1aea8577f3991b58ed6629685080b4002604d20ed0b2664596fa598ed4cfc03d"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:92c3c32e5b9cbd820e84925f0096298ddd893a46@sha256:81fee311428ccfce3dfb9d3ed5cba06db3995174b73937db416ab3fdc570decd"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/ginkgo-kernel.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ pipeline {
env.DOCKER_TAG = env.DOCKER_TAG + "-race"
env.RACE = 1
env.LOCKDEBUG = 1
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:1c8fec489280b3bd67ad44835cf3028bbf6ab207@sha256:1aea8577f3991b58ed6629685080b4002604d20ed0b2664596fa598ed4cfc03d"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:92c3c32e5b9cbd820e84925f0096298ddd893a46@sha256:81fee311428ccfce3dfb9d3ed5cba06db3995174b73937db416ab3fdc570decd"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pipeline {
)}"""
BASE_IMAGE="""${sh(
returnStdout: true,
script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:1c8fec489280b3bd67ad44835cf3028bbf6ab207@sha256:1aea8577f3991b58ed6629685080b4002604d20ed0b2664596fa598ed4cfc03d"; fi'
script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:92c3c32e5b9cbd820e84925f0096298ddd893a46@sha256:81fee311428ccfce3dfb9d3ed5cba06db3995174b73937db416ab3fdc570decd"; fi'
)}"""
}

Expand Down
2 changes: 1 addition & 1 deletion jenkinsfiles/kubernetes-upstream.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pipeline {
env.DOCKER_TAG = env.DOCKER_TAG + "-race"
env.RACE = 1
env.LOCKDEBUG = 1
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:1c8fec489280b3bd67ad44835cf3028bbf6ab207@sha256:1aea8577f3991b58ed6629685080b4002604d20ed0b2664596fa598ed4cfc03d"
env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:92c3c32e5b9cbd820e84925f0096298ddd893a46@sha256:81fee311428ccfce3dfb9d3ed5cba06db3995174b73937db416ab3fdc570decd"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/k8sT/manifests/demo-customcalls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ metadata:
spec:
containers:
- name: cilium-builder
image: quay.io/cilium/cilium-builder:93dc1e5dfed6c3cbe07a4ec784e0700328d869a6@sha256:94c24d3bf0fd640406bf19a5806ab66fb43f552617116bd2b36d3faaff94c921
image: quay.io/cilium/cilium-builder:e83adad6f522d961c6e77200a4594a6705cb1723@sha256:8ca398fb6d7a88fe693221529694a600545c7f91e1c1474768265edbc161886d
workingDir: /cilium
command: ["sleep"]
args:
Expand Down
2 changes: 1 addition & 1 deletion test/kubernetes-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ test -d kubernetes && rm -rfv kubernetes
git clone https://github.com/kubernetes/kubernetes.git -b ${KUBERNETES_VERSION} --depth 1
cd kubernetes

GO_VERSION="1.17.1"
GO_VERSION="1.17.2"
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.17.1"
GOLANG_VERSION="1.17.2"
VAGRANT_VERSION="2.2.16"
PACKER_VERSION="1.3.5"

Expand Down