diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 2e911d49d..d61085a33 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -1,6 +1,6 @@ name: checks env: - GO_VERSION: '1.22' + GO_VERSION: '1.23' on: pull_request: branches: @@ -42,7 +42,7 @@ jobs: - name: golangci-lint # Switch back to the official action after this bug is fixed: https://github.com/golangci/golangci-lint/issues/3107 run: | - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.58.1 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.61.0 $(go env GOPATH)/bin/golangci-lint run --out-format=github-actions --timeout=15m --verbose go-mod-tidy: name: go mod tidy diff --git a/.golangci.yml b/.golangci.yml index 9fb654d79..41e031690 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,6 @@ run: - # Timeout for analysis, e.g. 30s, 5m. - # Default: 1m timeout: 5m + go: 1.23 linters: disable-all: true @@ -13,7 +12,6 @@ linters: - govet - errcheck - gosec - # - lll issues: exclude-rules: @@ -31,16 +29,7 @@ issues: linters-settings: gofumpt: - # Select the Go version to target. - # Default: 1.15 - lang-version: "1.22" - - # Choose whether to use the extra rules. - # Default: false extra-rules: true - - # Module path which contains the source code being formatted. - # Default: empty string module-path: github.com/netapp/trident goimports: @@ -51,14 +40,16 @@ linters-settings: lll: # Max line length, lines longer will be reported. # '\t' is counted as 1 character by default, and can be changed with the tab-width option. - # Default: 120. line-length: 120 # Tab width in spaces. - # Default: 1 tab-width: 4 gosec: excludes: - # Exclude TLS client side erorrs for now, until Trident fully supports TLS1.3 - - 'G402' # Look for bad TLS connection settings + # Exclude TLS client side erorrs for now, until Trident fully supports TLS1.3 + - G402 # Look for bad TLS connection settings + - G115 + govet: + disable: + - printf diff --git a/BUILD.md b/BUILD.md index 71c406b25..0f300c36a 100644 --- a/BUILD.md +++ b/BUILD.md @@ -6,13 +6,13 @@ * Docker-compatible container cli, such as nerdctl or docker * Make, if not building natively or with linker flags -* Go 1.21 or greater, to optionally build Trident natively +* Go 1.23 or greater, to optionally build Trident natively ### Multi-Platform * Make * Docker -* Go 1.21 or greater, to optionally build Trident binaries natively +* Go 1.23 or greater, to optionally build Trident binaries natively * jq ## Makefile Parameters @@ -32,7 +32,7 @@ Container registry used to tag images and manifests, and optionally to push imag `GO_IMAGE` -Default: `golang:1.22` +Default: `golang:1.23` Container image used by default `$GO_SHELL` to run binary build scripts. @@ -48,7 +48,7 @@ Overrides default Go proxy. `HELM_IMAGE` -Default: `alpine/helm:3.6.1` +Default: `alpine/helm:3.16.1` Container image used by default `$HELM_CMD` to package helm chart. diff --git a/Makefile b/Makefile index f253819a1..3b40edf7e 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ REGISTRY ?= $(DEFAULT_REGISTRY) BUILDX_OUTPUT ?= load # GO_IMAGE golang image used in default GO_SHELL -GO_IMAGE ?= golang:1.22 +GO_IMAGE ?= golang:1.23 # GO_CMD go command used for go build GO_CMD ?= go @@ -26,7 +26,7 @@ GOPROXY ?= GOFLAGS ?= # HELM_IMAGE helm image used in default HELM_CMD -HELM_IMAGE ?= alpine/helm:3.6.1 +HELM_IMAGE ?= alpine/helm:3.16.1 # HELM_CHART_VERSION overrides the default chart version HELM_CHART_VERSION ?= diff --git a/go.mod b/go.mod index 209badeec..48ca8a6d9 100755 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/netapp/trident -go 1.22.0 +go 1.23.0 require ( cloud.google.com/go/netapp v1.1.0 // https://pkg.go.dev/cloud.google.com/go/netapp