diff --git a/.custom-gcl.yaml b/.custom-gcl.yaml index f9900157..d0031a80 100644 --- a/.custom-gcl.yaml +++ b/.custom-gcl.yaml @@ -1,7 +1,6 @@ -version: v2.5.0 name: golangci-lint-nilaway destination: ./bin plugins: - module: "go.uber.org/nilaway" import: "go.uber.org/nilaway/cmd/gclplugin" - version: "v0.0.0-20250821055425-361559d802f0" + version: "acb8859b9031bb9496be97e027df5573f9fb5340" diff --git a/.github/workflows/go-analyze.yml b/.github/workflows/go-analyze.yml index 0b19a249..64c54945 100644 --- a/.github/workflows/go-analyze.yml +++ b/.github/workflows/go-analyze.yml @@ -87,8 +87,5 @@ jobs: - name: Helm Lint run: mise run helm-lint - - name: Nilcheck - run: mise run nilcheck - - name: Vulncheck run: mise run vulncheck diff --git a/.golangci.yml b/.golangci.yml index 7697944a..b802f639 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -142,6 +142,7 @@ linters: - dupl - errcheck - gocognit + - goconst - gocritic - gocyclo - gosec @@ -159,6 +160,9 @@ linters: - linters: - gosec text: 'G104:' + - linters: + - govet + text: "cannot inline" paths: - zz_generated\..+\.go$ - third_party$ diff --git a/cloud/api.go b/cloud/api.go deleted file mode 100644 index f39a4b56..00000000 --- a/cloud/api.go +++ /dev/null @@ -1,8 +0,0 @@ -package cloud - -import "errors" - -var ( - ErrNotImplemented = errors.New("not implemented") - ErrLBUnsupported = errors.New("loadbalancer unsupported") -) diff --git a/go.mod b/go.mod index df0a73d8..47e1a330 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/linode/linode-cloud-controller-manager -go 1.26.0 +go 1.27.0 -toolchain go1.26.7 +toolchain go1.27.2 require ( github.com/appscode/go v0.0.0-20201105063637-5613f3b8169f diff --git a/mise.toml b/mise.toml index caee33b5..f4338354 100644 --- a/mise.toml +++ b/mise.toml @@ -6,8 +6,8 @@ EXP_CLUSTER_RESOURCE_SET = "true" GOTOOLCHAIN = "auto" [tools] -go = "1.26.7" -golangci-lint = "2.11.4" +go = "1.27.2" +golangci-lint = "2.14.0" helm = "3.16.3" kubectl = "1.36.2" kustomize = "5.8.1" @@ -98,7 +98,7 @@ run = "make lint-fix" [tasks.build-nilaway] description = "Build the custom NilAway-enabled golangci-lint binary" hide = true -run = "mkdir -p ./bin && golangci-lint custom" +run = "mkdir -p ./bin && golangci-lint custom --version v$(mise current golangci-lint)" [tasks.nilcheck] description = "Run nilaway lint checks" diff --git a/renovate.json5 b/renovate.json5 index 9ef89ef7..8acb34ac 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -94,9 +94,9 @@ "groupName": "mise tools", }, { - "description": "Keep the Go version in sync between go.mod and mise.toml.", + "description": "Group Go version and golangci-lint which needs to update with Go version bumps", "matchManagers": ["mise", "gomod"], - "matchDepNames": ["go"], + "matchDepNames": ["go", "golangci-lint"], "groupName": "go version", "groupSlug": "go-version", }