Merge pull request #65 from sivchari/migrate-golangci-lint-v2

Migrate golangci lint v2

Author: k8s-ci-robot

.custom-gcl.yml

@@ -1,4 +1,4 @@
-version:  v1.62.0
+version:  v2.0.2
 name: golangci-kube-api-linter
 destination: ./bin
 plugins:

.github/workflows/golangci-lint.yaml

@@ -20,6 +20,6 @@ jobs:
         with:
           go-version: '1.23.x'
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.62
+          version: v2.0.2

.golangci.yaml

@@ -1,17 +1,9 @@
+version: "2"
 linters:
-  disable-all: true
+  default: none
   # Enable specific linter
   # https://golangci-lint.run/usage/linters/#enabled-by-default-linters
   enable:
-    # Default linters
-    - errcheck
-    - gosimple
-    - govet
-    - ineffassign
-    - staticcheck
-    - typecheck
-    - unused
-    # Additional linters
     - asciicheck
     - bidichk
     - bodyclose
@@ -20,10 +12,11 @@ linters:
     - dogsled
     - dupl
     - durationcheck
+    - err113
+    - errcheck
     - errname
     - errorlint
     - exhaustive
-    - exportloopref
     - forcetypeassert
     - funlen
     - gochecknoglobals
@@ -32,13 +25,12 @@ linters:
     - gocritic
     - gocyclo
     - godot
-    - goerr113
-    - gofmt
     - goheader
-    - goimports
     - goprintffuncname
     - gosec
+    - govet
     - importas
+    - ineffassign
     - makezero
     - misspell
     - nakedret
@@ -51,66 +43,81 @@ linters:
     - prealloc
     - predeclared
     - revive
-    - stylecheck
+    - staticcheck
     - tagliatelle
-    - tenv
     - unconvert
     - unparam
+    - unused
     - wastedassign
     - whitespace
     - wrapcheck
     - wsl
-linters-settings:
-  goheader:
-    values:
-      regexp:
-        license-year: (202[5-9]|20[3-9][0-9])
-    template: |-
-      Copyright {{license-year}} The Kubernetes Authors.
+  settings:
+    goheader:
+      values:
+        regexp:
+          license-year: (202[5-9]|20[3-9][0-9])
+      template: |-
+        Copyright {{license-year}} The Kubernetes Authors.
 
-      Licensed under the Apache License, Version 2.0 (the "License");
-      you may not use this file except in compliance with the License.
-      You may obtain a copy of the License at
+        Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
 
-      	http://www.apache.org/licenses/LICENSE-2.0
+        	http://www.apache.org/licenses/LICENSE-2.0
 
-      Unless required by applicable law or agreed to in writing, software
-      distributed under the License is distributed on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-      See the License for the specific language governing permissions and
-      limitations under the License.
-  nlreturn:
-    block-size: 2
-  revive:
-    confidence: 0
-    rules:
-    - name: exported
-      severity: warning
-      disabled: false
-      arguments:
-        - "checkPrivateReceivers"
-        - "disableStutteringCheck"
-  stylecheck:
-    # https://staticcheck.io/docs/options#checks
-    checks: ["all", "-ST1000"]
-    dot-import-whitelist:
-      - "github.com/onsi/ginkgo/v2"
-      - "github.com/onsi/gomega"
-issues:
-  exclude:
-  - Analyzer is a global variable
-  exclude-use-default: false
-  exclude-rules:
-    # Exclude some linters from running on tests files.
-    - path: _test\.go
-      linters:
-        - gocyclo
-        - dupl
-        - gosec
-        - gochecknoglobals
-        - goerr113
-        - funlen
-    - path: testdata
-      linters:
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    nlreturn:
+      block-size: 2
+    revive:
+      confidence: 0
+      rules:
+        - name: exported
+          arguments:
+            - checkPrivateReceivers
+            - disableStutteringCheck
+          severity: warning
+          disabled: false
+    staticcheck:
+      # https://staticcheck.io/docs/options#checks
+      checks:
         - all
-      
+        - -ST1000
+      dot-import-whitelist:
+        - github.com/onsi/ginkgo/v2
+        - github.com/onsi/gomega
+  exclusions:
+    generated: lax
+    rules:
+      - linters:
+          - dupl
+          - err113
+          - funlen
+          - gochecknoglobals
+          - gocyclo
+          - gosec
+        # Exclude some linters from running on tests files.
+        path: _test\.go
+      - linters:
+          - all
+        path: testdata
+      - path: (.+)\.go$
+        text: Analyzer is a global variable
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -1,5 +1,5 @@
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
-GOLANGCI_LINT = go run ${PROJECT_DIR}/vendor/github.com/golangci/golangci-lint/cmd/golangci-lint
+GOLANGCI_LINT = go run ${PROJECT_DIR}/vendor/github.com/golangci/golangci-lint/v2/cmd/golangci-lint
 
 VERSION     ?= $(shell git describe --always --abbrev=7)
 
@@ -44,7 +44,7 @@ lint: ## Run golangci-lint over the codebase.
 	${GOLANGCI_LINT} run ./... --timeout 5m -v
 
 .PHONY: lint-fix
-lint-fix: $(GOLANGCI_LINT) ## Run golangci-lint over the codebase and run auto-fixers if supported by the linter
+lint-fix: ## Run golangci-lint over the codebase and run auto-fixers if supported by the linter
 	${GOLANGCI_LINT} run ./... --timeout 5m -v --fix
 
 .PHONY: test