Update Go to 1.18

Run `go fix ./...` to remove `// +build` tags. Fix goleak checks in pkg/hubble/container to work with Go 1.18 due to change in function on top of stack. Signed-off-by: Tobias Klauser <tobias@cilium.io>
gazandic · Mar 28, 2022 · 1108684 · 1108684
1 parent c4be82a
commit 1108684
Show file tree

Hide file tree

Showing 440 changed files with 39 additions and 454 deletions.
diff --git a/.github/workflows/build-images-ci.yaml b/.github/workflows/build-images-ci.yaml
@@ -147,7 +147,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:0da282e47af1907e17a1aa8dba3d41de6879ef62@sha256:9359be20d242518ffcaab23ec3dfbff7ffc3bd383e845963323e0420fa4b462b
+            BASE_IMAGE=quay.io/cilium/cilium-runtime:efb92c208c5f1f190243b361cbb43413ca49d534@sha256:8ca66f05327b5affad2bfb09614636f2b0d3fa24a9f40d1b5f86c2ef9ca2e46a
             LOCKDEBUG=1
             RACE=1
             OPERATOR_VARIANT=${{ matrix.name }}
@@ -196,7 +196,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:0da282e47af1907e17a1aa8dba3d41de6879ef62@sha256:9359be20d242518ffcaab23ec3dfbff7ffc3bd383e845963323e0420fa4b462b
+            BASE_IMAGE=quay.io/cilium/cilium-runtime:efb92c208c5f1f190243b361cbb43413ca49d534@sha256:8ca66f05327b5affad2bfb09614636f2b0d3fa24a9f40d1b5f86c2ef9ca2e46a
             LOCKDEBUG=1
             RACE=1
             OPERATOR_VARIANT=${{ matrix.name }}

diff --git a/.github/workflows/lint-bpf-checks.yaml b/.github/workflows/lint-bpf-checks.yaml
@@ -89,7 +89,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
         with:
-          go-version: 1.17.8
+          go-version: 1.18.0
       - name: Cache LLVM and Clang
         id: cache-llvm
         uses: actions/cache@4b0cf6cc4619e737324ddfcec08fff2413359514

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@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
         with:
-          go-version: 1.17.8
+          go-version: 1.18.0
 
       - 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@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
         with:
-          go-version: 1.17.8
+          go-version: 1.18.0
       - name: Checkout code
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
         with:
@@ -47,7 +47,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
         with:
-          go-version: 1.17.8
+          go-version: 1.18.0
       - name: Checkout code
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
         with:
@@ -72,7 +72,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
         with:
-          go-version: 1.17.8
+          go-version: 1.18.0
       - name: Checkout code
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
         with:
@@ -98,7 +98,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
         with:
-          go-version: 1.17.8
+          go-version: 1.18.0
       - name: Checkout code
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
         with:
@@ -124,7 +124,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
         with:
-          go-version: 1.17.8
+          go-version: 1.18.0
       - name: Checkout code
         uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
         with:

diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: go
 dist: focal
 sudo: required
 
-go: "1.17.8"
+go: "1.18"
 
 jobs:
   include:
@@ -16,7 +16,7 @@ jobs:
       if: type != pull_request
       env:
         - RACE=1
-        - BASE_IMAGE=quay.io/cilium/cilium-runtime:0da282e47af1907e17a1aa8dba3d41de6879ef62@sha256:9359be20d242518ffcaab23ec3dfbff7ffc3bd383e845963323e0420fa4b462b
+        - BASE_IMAGE=quay.io/cilium/cilium-runtime:efb92c208c5f1f190243b361cbb43413ca49d534@sha256:8ca66f05327b5affad2bfb09614636f2b0d3fa24a9f40d1b5f86c2ef9ca2e46a
         - LOCKDEBUG=1
 
 # Disabled due to a compilation issue: https://github.com/cilium/cilium/issues/13252
@@ -25,7 +25,7 @@ jobs:
 #      if: type != pull_request
 #      env:
 #        - RACE=1
-#        - BASE_IMAGE=quay.io/cilium/cilium-runtime:0da282e47af1907e17a1aa8dba3d41de6879ef62@sha256:9359be20d242518ffcaab23ec3dfbff7ffc3bd383e845963323e0420fa4b462b
+#        - BASE_IMAGE=quay.io/cilium/cilium-runtime:efb92c208c5f1f190243b361cbb43413ca49d534@sha256:8ca66f05327b5affad2bfb09614636f2b0d3fa24a9f40d1b5f86c2ef9ca2e46a
 #        - LOCKDEBUG=1
 #      virt: vm
 #      group: edge

diff --git a/GO_VERSION b/GO_VERSION
@@ -1 +1 @@
-1.17.8
+1.18
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:cedbb2b3142dd78d26e88a8061aa53c371a22c75@sha256:45f76b4957ed30f84abd1762039235f07bcdbbac063f1550e54c6423b145a75a
+CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:ff6f18ae83fe9d80ac00e0204954cc27c73eecd0@sha256:87550fa6d231e660106bf8dd73609675213ff98621b02c2454d5f72125c13afd
 
 .PHONY: proto
 proto:

diff --git a/bugtool/cmd/ethtool_linux.go b/bugtool/cmd/ethtool_linux.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build linux
-// +build linux
 
 package cmd
 

diff --git a/bugtool/cmd/ethtool_other.go b/bugtool/cmd/ethtool_other.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !linux
-// +build !linux
 
 package cmd
 

diff --git a/bugtool/cmd/helper_test.go b/bugtool/cmd/helper_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests
-// +build !privileged_tests
 
 package cmd
 

diff --git a/bugtool/main.go b/bugtool/main.go
@@ -4,7 +4,6 @@
 // Ensure build fails on versions of Go that are not supported by Cilium.
 // This build tag should be kept in sync with the version specified in go.mod.
 //go:build go1.17
-// +build go1.17
 
 package main
 

diff --git a/cilium-health/main.go b/cilium-health/main.go
@@ -4,7 +4,6 @@
 // Ensure build fails on versions of Go that are not supported by Cilium.
 // This build tag should be kept in sync with the version specified in go.mod.
 //go:build go1.17
-// +build go1.17
 
 package main
 

diff --git a/cilium-health/responder/main.go b/cilium-health/responder/main.go
@@ -4,7 +4,6 @@
 // Ensure build fails on versions of Go that are not supported by Cilium.
 // This build tag should be kept in sync with the version specified in go.mod.
 //go:build go1.17
-// +build go1.17
 
 package main
 

diff --git a/cilium/cmd/bpf_ct_list_test.go b/cilium/cmd/bpf_ct_list_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests
-// +build !privileged_tests
 
 package cmd
 

diff --git a/cilium/cmd/bpf_ipcache_get_test.go b/cilium/cmd/bpf_ipcache_get_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests
-// +build !privileged_tests
 
 package cmd
 

diff --git a/cilium/cmd/bpf_metrics_list_test.go b/cilium/cmd/bpf_metrics_list_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests
-// +build !privileged_tests
 
 package cmd
 

diff --git a/cilium/cmd/bpf_nat_list_test.go b/cilium/cmd/bpf_nat_list_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests
-// +build !privileged_tests
 
 package cmd
 

diff --git a/cilium/cmd/encrypt_status_test.go b/cilium/cmd/encrypt_status_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build privileged_tests
-// +build privileged_tests
 
 package cmd
 

diff --git a/cilium/cmd/helpers_test.go b/cilium/cmd/helpers_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests
-// +build !privileged_tests
 
 package cmd
 

diff --git a/cilium/main.go b/cilium/main.go
@@ -4,7 +4,6 @@
 // Ensure build fails on versions of Go that are not supported by Cilium.
 // This build tag should be kept in sync with the version specified in go.mod.
 //go:build go1.17
-// +build go1.17
 
 package main
 

diff --git a/clustermesh-apiserver/main.go b/clustermesh-apiserver/main.go
@@ -4,7 +4,6 @@
 // Ensure build fails on versions of Go that are not supported by Cilium.
 // This build tag should be kept in sync with the version specified in go.mod.
 //go:build go1.17
-// +build go1.17
 
 package main
 

diff --git a/contrib/scripts/check-missing-tags-in-tests.sh b/contrib/scripts/check-missing-tags-in-tests.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-files_missing_build_tag="`grep -L -r '// +build' . --include \*_test.go \
+files_missing_build_tag="`grep -L -r '//go:build' . --include \*_test.go \
     --exclude-dir={.git,_build,vendor,test}`"
 if [ -n "$files_missing_build_tag" ]; then
   echo "Test file(s) does not contain a tag privileged_tests or !privileged_tests tags:"

diff --git a/daemon/cmd/daemon_test.go b/daemon/cmd/daemon_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests && integration_tests
-// +build !privileged_tests,integration_tests
 
 package cmd
 

diff --git a/daemon/cmd/debuginfo_test.go b/daemon/cmd/debuginfo_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests && integration_tests
-// +build !privileged_tests,integration_tests
 
 package cmd
 

diff --git a/daemon/cmd/devices_test.go b/daemon/cmd/devices_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build linux && privileged_tests
-// +build linux,privileged_tests
 
 package cmd
 

diff --git a/daemon/cmd/endpoint_test.go b/daemon/cmd/endpoint_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests && integration_tests
-// +build !privileged_tests,integration_tests
 
 package cmd
 

diff --git a/daemon/cmd/fqdn_test.go b/daemon/cmd/fqdn_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests && integration_tests
-// +build !privileged_tests,integration_tests
 
 package cmd
 

diff --git a/daemon/cmd/ipcache_test.go b/daemon/cmd/ipcache_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests && integration_tests
-// +build !privileged_tests,integration_tests
 
 package cmd
 

diff --git a/daemon/cmd/kube_proxy_healthz_test.go b/daemon/cmd/kube_proxy_healthz_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests
-// +build !privileged_tests
 
 package cmd
 

diff --git a/daemon/cmd/nodeport_linux_test.go b/daemon/cmd/nodeport_linux_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build linux && privileged_tests
-// +build linux,privileged_tests
 
 package cmd
 

diff --git a/daemon/cmd/policy_test.go b/daemon/cmd/policy_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests && integration_tests
-// +build !privileged_tests,integration_tests
 
 package cmd
 

diff --git a/daemon/cmd/status_test.go b/daemon/cmd/status_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build !privileged_tests
-// +build !privileged_tests
 
 package cmd
 

diff --git a/daemon/cmd/sysctl_linux_test.go b/daemon/cmd/sysctl_linux_test.go
@@ -2,7 +2,6 @@
 // Copyright Authors of Cilium
 
 //go:build linux && privileged_tests
-// +build linux,privileged_tests
 
 package cmd
 

diff --git a/daemon/main.go b/daemon/main.go
@@ -4,7 +4,6 @@
 // Ensure build fails on versions of Go that are not supported by Cilium.
 // This build tag should be kept in sync with the version specified in go.mod.
 //go:build go1.17
-// +build go1.17
 
 package main
 

diff --git a/hubble-relay/main.go b/hubble-relay/main.go
@@ -4,7 +4,6 @@
 // Ensure build fails on versions of Go that are not supported by Cilium.
 // This build tag should be kept in sync with the version specified in go.mod.
 //go:build go1.17
-// +build go1.17
 
 package main
 

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:0da282e47af1907e17a1aa8dba3d41de6879ef62@sha256:9359be20d242518ffcaab23ec3dfbff7ffc3bd383e845963323e0420fa4b462b
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:efb92c208c5f1f190243b361cbb43413ca49d534@sha256:8ca66f05327b5affad2bfb09614636f2b0d3fa24a9f40d1b5f86c2ef9ca2e46a
 ARG TESTER_IMAGE=quay.io/cilium/image-tester:c37f768323abfba87c90cd9c82d37136183457bc@sha256:4c9d640b6379eb4964b8590acc95ca2dfaa71df70f4467fb7d8ac076acf6a8e1
-ARG GOLANG_IMAGE=docker.io/library/golang:1.17.8@sha256:ca709802394f4744685c1ecc083965656c3633799a005e90c75c62cafbaf3cee
+ARG GOLANG_IMAGE=docker.io/library/golang:1.18.0@sha256:b5a9ae5907066849cbb2b47af93713b1f030e3eb6b36d84f2ae5f354b25c80d4
 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.17.8@sha256:ca709802394f4744685c1ecc083965656c3633799a005e90c75c62cafbaf3cee
+ARG GOLANG_IMAGE=docker.io/library/golang:1.18.0@sha256:b5a9ae5907066849cbb2b47af93713b1f030e3eb6b36d84f2ae5f354b25c80d4
 
 # 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 2020-2021 Authors of Cilium
 # SPDX-License-Identifier: Apache-2.0
 
-ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:cedbb2b3142dd78d26e88a8061aa53c371a22c75@sha256:45f76b4957ed30f84abd1762039235f07bcdbbac063f1550e54c6423b145a75a
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:ff6f18ae83fe9d80ac00e0204954cc27c73eecd0@sha256:87550fa6d231e660106bf8dd73609675213ff98621b02c2454d5f72125c13afd
 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 2020-2021 Authors of Cilium
 # SPDX-License-Identifier: Apache-2.0
 
-ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:cedbb2b3142dd78d26e88a8061aa53c371a22c75@sha256:45f76b4957ed30f84abd1762039235f07bcdbbac063f1550e54c6423b145a75a
-ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:0da282e47af1907e17a1aa8dba3d41de6879ef62@sha256:9359be20d242518ffcaab23ec3dfbff7ffc3bd383e845963323e0420fa4b462b
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:ff6f18ae83fe9d80ac00e0204954cc27c73eecd0@sha256:87550fa6d231e660106bf8dd73609675213ff98621b02c2454d5f72125c13afd
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:efb92c208c5f1f190243b361cbb43413ca49d534@sha256:8ca66f05327b5affad2bfb09614636f2b0d3fa24a9f40d1b5f86c2ef9ca2e46a
 
 # 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.17.8@sha256:ca709802394f4744685c1ecc083965656c3633799a005e90c75c62cafbaf3cee
+ARG GOLANG_IMAGE=docker.io/library/golang:1.18.0@sha256:b5a9ae5907066849cbb2b47af93713b1f030e3eb6b36d84f2ae5f354b25c80d4
 ARG ALPINE_IMAGE=docker.io/library/alpine:3.12.7@sha256:36553b10a4947067b9fbb7d532951066293a68eae893beba1d9235f7d11a20ad
 
 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.