Update Go to 1.18.6

This version fixes a security issue in the net/http package. See the release notes [1] for more details [1] https://go.dev/doc/devel/release#go1.18.6 Signed-off-by: Tobias Klauser <tobias@cilium.io>
cilium · Sep 9, 2022 · 521f6e6 · 521f6e6
1 parent 6511bda
commit 521f6e6
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/lint-bpf-checks.yaml b/.github/workflows/lint-bpf-checks.yaml
@@ -93,7 +93,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
         with:
-          go-version: 1.18.5
+          go-version: 1.18.6
       - name: Cache LLVM and Clang
         id: cache-llvm
         uses: actions/cache@fd5de65bc895cf536527842281bea11763fefd77

diff --git a/.github/workflows/lint-build-commits.yaml b/.github/workflows/lint-build-commits.yaml
@@ -23,7 +23,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
         with:
-          go-version: 1.18.5
+          go-version: 1.18.6
 
       - name: Cache LLVM and Clang
         id: cache-llvm

diff --git a/.github/workflows/lint-go.yaml b/.github/workflows/lint-go.yaml
@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
         with:
-          go-version: 1.18.5
+          go-version: 1.18.6
       - name: Checkout code
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
         with:
@@ -47,7 +47,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
         with:
-          go-version: 1.18.5
+          go-version: 1.18.6
       - name: Checkout code
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
         with:
@@ -72,7 +72,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
         with:
-          go-version: 1.18.5
+          go-version: 1.18.6
       - name: Checkout code
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
         with:
@@ -98,7 +98,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
         with:
-          go-version: 1.18.5
+          go-version: 1.18.6
       - name: Checkout code
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
         with:
@@ -124,7 +124,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f
         with:
-          go-version: 1.18.5
+          go-version: 1.18.6
       - name: Checkout code
         uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
         with:

diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: go
 dist: focal
 sudo: required
 
-go: "1.18.5"
+go: "1.18.6"
 
 jobs:
   include:

diff --git a/GO_VERSION b/GO_VERSION
@@ -1 +1 @@
-1.18.5
+1.18.6
diff --git a/api/v1/Makefile b/api/v1/Makefile
@@ -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:203448b6efdbcff0fa9c00a082ae1b802047c6f9@sha256:32dda3d71a1f9259a69f72e46d689eb6b3d27a5cf4858f7a10be632ceb51fbdd
+CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:b9b4e9886d40ca38605dbfd6bba9901ed07de618@sha256:574c4bfcf66063226bcf65803f2a17208421af863e762ecb9d30c8c604853813
 
 .PHONY: proto
 proto:

diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ARG COMPILERS_IMAGE=quay.io/cilium/image-compilers:e847f4176cb42ae27fa459a10df6721c43702b64@sha256:78df068553627c53d8dbe0f61275271b597c55c60585f3ea9f6916bd3cfd611a
-ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:e98e9766f706afc5543004e83f1eea1db74a1b39@sha256:a9041b020480bfe53b40ce6acdc70b0047a9ab653c647df465252e91eb84fbc6
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:c192d7f200bae4cf7a9e1a89f6783f55e2dc6cde@sha256:58731d3071bd226673cc440ddf616e80db94d3191937f02f544d081cfc9c3ee6
 ARG TESTER_IMAGE=quay.io/cilium/image-tester:c37f768323abfba87c90cd9c82d37136183457bc@sha256:4c9d640b6379eb4964b8590acc95ca2dfaa71df70f4467fb7d8ac076acf6a8e1
-ARG GOLANG_IMAGE=docker.io/library/golang:1.18.5@sha256:fb249eca1b9172732de4950b0fb0fb5c231b83c2c90952c56d822d8a9de4d64b
+ARG GOLANG_IMAGE=docker.io/library/golang:1.18.6@sha256:f1741ed3855b1a558f3c057f777667a4b73ff250c4f1bee7f0388cc2d1224079
 ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:547db7ec9a750b8f888a506709adb41f135b952e@sha256:4d6fa0aede3556c5fb5a9c71bc6b9585475ac9b1064f516d4c45c8fb691c9d9e
 
 FROM ${COMPILERS_IMAGE} as compilers-image

diff --git a/images/cilium-docker-plugin/Dockerfile b/images/cilium-docker-plugin/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ARG BASE_IMAGE=scratch
-ARG GOLANG_IMAGE=docker.io/library/golang:1.18.5@sha256:fb249eca1b9172732de4950b0fb0fb5c231b83c2c90952c56d822d8a9de4d64b
+ARG GOLANG_IMAGE=docker.io/library/golang:1.18.6@sha256:f1741ed3855b1a558f3c057f777667a4b73ff250c4f1bee7f0388cc2d1224079
 
 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
 # Represents the plataform where the build is happening, do not mix with

diff --git a/images/cilium-test/Dockerfile b/images/cilium-test/Dockerfile
@@ -3,7 +3,7 @@
 # Copyright Authors of Cilium
 # SPDX-License-Identifier: Apache-2.0
 
-ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:203448b6efdbcff0fa9c00a082ae1b802047c6f9@sha256:32dda3d71a1f9259a69f72e46d689eb6b3d27a5cf4858f7a10be632ceb51fbdd
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:b9b4e9886d40ca38605dbfd6bba9901ed07de618@sha256:574c4bfcf66063226bcf65803f2a17208421af863e762ecb9d30c8c604853813
 ARG UBUNTU_IMAGE=docker.io/library/ubuntu:20.04@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93
 
 FROM ${UBUNTU_IMAGE} as rootfs

diff --git a/images/cilium/Dockerfile b/images/cilium/Dockerfile
@@ -3,8 +3,8 @@
 # Copyright Authors of Cilium
 # SPDX-License-Identifier: Apache-2.0
 
-ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:203448b6efdbcff0fa9c00a082ae1b802047c6f9@sha256:32dda3d71a1f9259a69f72e46d689eb6b3d27a5cf4858f7a10be632ceb51fbdd
-ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:e98e9766f706afc5543004e83f1eea1db74a1b39@sha256:a9041b020480bfe53b40ce6acdc70b0047a9ab653c647df465252e91eb84fbc6
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:b9b4e9886d40ca38605dbfd6bba9901ed07de618@sha256:574c4bfcf66063226bcf65803f2a17208421af863e762ecb9d30c8c604853813
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:c192d7f200bae4cf7a9e1a89f6783f55e2dc6cde@sha256:58731d3071bd226673cc440ddf616e80db94d3191937f02f544d081cfc9c3ee6
 
 # cilium-envoy from github.com/cilium/proxy
 #

diff --git a/images/clustermesh-apiserver/Dockerfile b/images/clustermesh-apiserver/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ARG BASE_IMAGE=scratch
-ARG GOLANG_IMAGE=docker.io/library/golang:1.18.5@sha256:fb249eca1b9172732de4950b0fb0fb5c231b83c2c90952c56d822d8a9de4d64b
+ARG GOLANG_IMAGE=docker.io/library/golang:1.18.6@sha256:f1741ed3855b1a558f3c057f777667a4b73ff250c4f1bee7f0388cc2d1224079
 ARG ALPINE_IMAGE=docker.io/library/alpine:3.16.0@sha256:686d8c9dfa6f3ccfc8230bc3178d23f84eeaf7e457f36f271ab1acc53015037c
 
 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.

diff --git a/images/hubble-relay/Dockerfile b/images/hubble-relay/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ARG BASE_IMAGE=scratch
-ARG GOLANG_IMAGE=docker.io/library/golang:1.18.5@sha256:fb249eca1b9172732de4950b0fb0fb5c231b83c2c90952c56d822d8a9de4d64b
+ARG GOLANG_IMAGE=docker.io/library/golang:1.18.6@sha256:f1741ed3855b1a558f3c057f777667a4b73ff250c4f1bee7f0388cc2d1224079
 ARG ALPINE_IMAGE=docker.io/library/alpine:3.16.0@sha256:686d8c9dfa6f3ccfc8230bc3178d23f84eeaf7e457f36f271ab1acc53015037c
 
 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.

diff --git a/images/operator/Dockerfile b/images/operator/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ARG BASE_IMAGE=scratch
-ARG GOLANG_IMAGE=docker.io/library/golang:1.18.5@sha256:fb249eca1b9172732de4950b0fb0fb5c231b83c2c90952c56d822d8a9de4d64b
+ARG GOLANG_IMAGE=docker.io/library/golang:1.18.6@sha256:f1741ed3855b1a558f3c057f777667a4b73ff250c4f1bee7f0388cc2d1224079
 ARG ALPINE_IMAGE=docker.io/library/alpine:3.16.0@sha256:686d8c9dfa6f3ccfc8230bc3178d23f84eeaf7e457f36f271ab1acc53015037c
 
 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.

diff --git a/images/runtime/Dockerfile b/images/runtime/Dockerfile
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ARG TESTER_IMAGE=quay.io/cilium/image-tester:c37f768323abfba87c90cd9c82d37136183457bc@sha256:4c9d640b6379eb4964b8590acc95ca2dfaa71df70f4467fb7d8ac076acf6a8e1
-ARG GOLANG_IMAGE=docker.io/library/golang:1.18.5@sha256:fb249eca1b9172732de4950b0fb0fb5c231b83c2c90952c56d822d8a9de4d64b
+ARG GOLANG_IMAGE=docker.io/library/golang:1.18.6@sha256:f1741ed3855b1a558f3c057f777667a4b73ff250c4f1bee7f0388cc2d1224079
 ARG UBUNTU_IMAGE=docker.io/library/ubuntu:20.04@sha256:626ffe58f6e7566e00254b638eb7e0f3b11d4da9675088f4781a50ae288f3322
 
 ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:547db7ec9a750b8f888a506709adb41f135b952e@sha256:4d6fa0aede3556c5fb5a9c71bc6b9585475ac9b1064f516d4c45c8fb691c9d9e

diff --git a/images/scripts/update-golang-image.sh b/images/scripts/update-golang-image.sh
@@ -19,7 +19,7 @@ root_dir="$(git rev-parse --show-toplevel)"
 
 cd "${root_dir}"
 
-go_version=1.18.5
+go_version=1.18.6
 
 image="${1:-docker.io/library/golang:${go_version}}"
 image_digest="$("${script_dir}/get-image-digest.sh" "${image}")"

diff --git a/jenkinsfiles/ginkgo-gke.Jenkinsfile b/jenkinsfiles/ginkgo-gke.Jenkinsfile
@@ -80,7 +80,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:e98e9766f706afc5543004e83f1eea1db74a1b39@sha256:a9041b020480bfe53b40ce6acdc70b0047a9ab653c647df465252e91eb84fbc6"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:c192d7f200bae4cf7a9e1a89f6783f55e2dc6cde@sha256:58731d3071bd226673cc440ddf616e80db94d3191937f02f544d081cfc9c3ee6"
                     }
                 }
             }

diff --git a/jenkinsfiles/ginkgo-kernel.Jenkinsfile b/jenkinsfiles/ginkgo-kernel.Jenkinsfile
@@ -97,7 +97,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:e98e9766f706afc5543004e83f1eea1db74a1b39@sha256:a9041b020480bfe53b40ce6acdc70b0047a9ab653c647df465252e91eb84fbc6"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:c192d7f200bae4cf7a9e1a89f6783f55e2dc6cde@sha256:58731d3071bd226673cc440ddf616e80db94d3191937f02f544d081cfc9c3ee6"
                     }
                 }
             }

diff --git a/jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile b/jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile
@@ -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:e98e9766f706afc5543004e83f1eea1db74a1b39@sha256:a9041b020480bfe53b40ce6acdc70b0047a9ab653c647df465252e91eb84fbc6"; fi'
+                script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:c192d7f200bae4cf7a9e1a89f6783f55e2dc6cde@sha256:58731d3071bd226673cc440ddf616e80db94d3191937f02f544d081cfc9c3ee6"; fi'
             )}"""
     }
 

diff --git a/jenkinsfiles/kubernetes-upstream.Jenkinsfile b/jenkinsfiles/kubernetes-upstream.Jenkinsfile
@@ -60,7 +60,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:e98e9766f706afc5543004e83f1eea1db74a1b39@sha256:a9041b020480bfe53b40ce6acdc70b0047a9ab653c647df465252e91eb84fbc6"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:c192d7f200bae4cf7a9e1a89f6783f55e2dc6cde@sha256:58731d3071bd226673cc440ddf616e80db94d3191937f02f544d081cfc9c3ee6"
                     }
                 }
             }

diff --git a/test/k8s/manifests/demo-customcalls.yaml b/test/k8s/manifests/demo-customcalls.yaml
@@ -99,7 +99,7 @@ metadata:
 spec:
   containers:
   - name: cilium-builder
-    image: quay.io/cilium/cilium-builder:203448b6efdbcff0fa9c00a082ae1b802047c6f9@sha256:32dda3d71a1f9259a69f72e46d689eb6b3d27a5cf4858f7a10be632ceb51fbdd
+    image: quay.io/cilium/cilium-builder:b9b4e9886d40ca38605dbfd6bba9901ed07de618@sha256:574c4bfcf66063226bcf65803f2a17208421af863e762ecb9d30c8c604853813
     workingDir: /cilium
     command: ["sleep"]
     args:

diff --git a/test/kubernetes-test.sh b/test/kubernetes-test.sh
@@ -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.18.5"
+GO_VERSION="1.18.6"
 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.18.5"
+GOLANG_VERSION="1.18.6"
 VAGRANT_VERSION="2.2.16"
 PACKER_VERSION="1.3.5"