Update Go to v1.18

Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
cilium · Mar 17, 2022 · 1efdbe0 · 1efdbe0
1 parent d0882e2
commit 1efdbe0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -22,13 +22,16 @@ jobs:
     - uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846
     - uses: actions/setup-go@v2.2.0
       with:
-        go-version: '1.17.8'
+        go-version: '1.18.0'
     - name: Run static checks
-      uses: golangci/golangci-lint-action@v3.1.0
-      with:
-        version: v1.44.2
-        args: --config=.golangci.yml --verbose
-        skip-cache: true
+      # TODO: uncomment config below and remove `run: make check` once a
+      # version of golangci-lint with support for Go 1.18 is released.
+      run: make check
+      # uses: golangci/golangci-lint-action@v3.1.0
+      # with:
+      #   version: v1.44.2
+      #   args: --config=.golangci.yml --verbose
+      #   skip-cache: true
     - name: Check module vendoring
       run: |
         go mod tidy

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/golang:1.17.8-alpine3.15@sha256:b35984144ec2c2dfd6200e112a9b8ecec4a8fd9eff0babaff330f1f82f14cb2a as builder
+FROM docker.io/library/golang:1.18.0-alpine3.15@sha256:075f67eb81e6def1fca765d808ccf6a36eb675071dc4d579e8e8ca5d8f12edc8 as builder
 WORKDIR /go/src/github.com/cilium/hubble
 RUN apk add --no-cache git make
 COPY . .

diff --git a/Makefile b/Makefile
@@ -25,8 +25,8 @@ hubble:
 	$(GO_BUILD) $(if $(GO_TAGS),-tags $(GO_TAGS)) -ldflags "-w -s -X 'github.com/cilium/hubble/pkg.GitBranch=${GIT_BRANCH}' -X 'github.com/cilium/hubble/pkg.GitHash=$(GIT_HASH)' -X 'github.com/cilium/hubble/pkg.Version=${VERSION}'" -o $(TARGET)
 
 release:
-	docker run --env "RELEASE_UID=$(RELEASE_UID)" --env "RELEASE_GID=$(RELEASE_GID)" --rm --workdir /hubble --volume `pwd`:/hubble docker.io/library/golang:1.17.8-alpine3.15 \
-		sh -c "apk add --no-cache make && make local-release"
+	docker run --env "RELEASE_UID=$(RELEASE_UID)" --env "RELEASE_GID=$(RELEASE_GID)" --rm --workdir /hubble --volume `pwd`:/hubble docker.io/library/golang:1.18.0-alpine3.15 \
+		sh -c "apk add --no-cache make git && make local-release"
 
 local-release: clean
 	for OS in darwin linux windows; do \

diff --git a/cmd/record/tty_linux.go b/cmd/record/tty_linux.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package record
 

diff --git a/cmd/record/tty_others.go b/cmd/record/tty_others.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !linux
-// +build !linux
 
 package record
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/cilium/hubble
 
-go 1.17
+go 1.18
 
 require (
 	github.com/cilium/cilium v1.11.1

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