diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 8231ddc2e3..309acb1e70 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -21,12 +21,12 @@ jobs: - name: Set up Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.5 + go-version: 1.20.0 - name: Run static checks uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5 with: - version: v1.50.1 + version: v1.51.0 args: --config=.golangci.yml --verbose skip-cache: true diff --git a/.github/workflows/kind.yaml b/.github/workflows/kind.yaml index 134b09c4df..9c98de51c0 100644 --- a/.github/workflows/kind.yaml +++ b/.github/workflows/kind.yaml @@ -37,7 +37,7 @@ jobs: - name: Set up Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.5 + go-version: 1.20.0 - name: Set up Go for root run: | diff --git a/.github/workflows/multicluster.yaml b/.github/workflows/multicluster.yaml index 1992cdfd15..18abae0656 100644 --- a/.github/workflows/multicluster.yaml +++ b/.github/workflows/multicluster.yaml @@ -75,7 +75,7 @@ jobs: - name: Set up Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.5 + go-version: 1.20.0 - name: Set up job variables id: vars diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a521703ec5..2926b7ecd4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 with: - go-version: 1.19.5 + go-version: 1.20.0 - name: Generate the artifacts run: make release diff --git a/.golangci.yml b/.golangci.yml index 70c213ea12..4886057245 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -23,16 +23,16 @@ linters-settings: goimports: local-prefixes: github.com/cilium/cilium-cli gosimple: - go: "1.19" + go: "1.20" govet: enable-all: true disable: - fieldalignment - shadow staticcheck: - go: "1.19" + go: "1.20" unused: - go: "1.19" + go: "1.20" issues: # This also warns about credential name variables which are false positives. diff --git a/Makefile b/Makefile index 25556cce04..0425c4431b 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ TEST_TIMEOUT ?= 5s RELEASE_UID ?= $(shell id -u) RELEASE_GID ?= $(shell id -g) -GOLANGCILINT_WANT_VERSION = 1.50.1 +GOLANGCILINT_WANT_VERSION = 1.51.0 GOLANGCILINT_VERSION = $(shell golangci-lint version 2>/dev/null) $(TARGET): @@ -27,7 +27,7 @@ release: docker run \ --rm \ --workdir /cilium \ - --volume `pwd`:/cilium docker.io/library/golang:1.19.5-alpine3.17 \ + --volume `pwd`:/cilium docker.io/library/golang:1.20.0-alpine3.17 \ sh -c "apk add --no-cache setpriv make git && \ /usr/bin/setpriv --reuid=$(RELEASE_UID) --regid=$(RELEASE_GID) --clear-groups make GOCACHE=/tmp/gocache local-release" diff --git a/go.mod b/go.mod index a69b44b73e..ccac7c2cc9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cilium/cilium-cli -go 1.19 +go 1.20 // Replace directives from github.com/cilium/cilium. Keep in sync when updating Cilium! replace (