bump golangci-lint to v2

Signed-off-by: Iceber Gu <[email protected]>

Author: Iceber

.github/workflows/ci.yml

@@ -13,9 +13,9 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: '1.22'
-      - uses: golangci/golangci-lint-action@v6
+      - uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.54
+          version: v2.1.6
   vertify:
     name: Vertify import alias, vendor, codegen, crds
     runs-on: ubuntu-latest

.golangci.yml

@@ -1,42 +1,66 @@
+version: "2"
 run:
-  timeout: 10m
   modules-download-mode: vendor
 linters:
-  disable-all: true
+  default: none
   enable:
     - bodyclose
     - dupl
     - errcheck
-    - gci
-    - gofmt
-    - goimports
-    - gosimple
     - govet
     - ineffassign
     - misspell
     - staticcheck
-    - typecheck
     - unused
     - whitespace
-linters-settings:
-  goimports:
-    local-prefixes: github.com/clusterpedia-io
-  misspell:
-    ignore-words:
-      - creater
-  gci:
-    sections:
-      - Standard
-      - Default
-      - Prefix(github.com/clusterpedia-io)
-  staticcheck:
-    checks:
-      - all
-      - "-SA1019" # disable the rule SA1019(Using a deprecated function, variable, constant or field)
-output:
-  sort-results: true
-
-issues:
-  exclude-rules:
-    - path: pkg/storage/memorystorage/v2/
-      linters: unused # memory v2 is in alpha and tolerates unused functions or fields
+  settings:
+    misspell:
+      ignore-rules:
+        - creater
+    staticcheck:
+      checks:
+        - all
+        # Poorly chosen identifier.
+        # https://staticcheck.dev/docs/checks/#ST1003
+        - -ST1003
+        # Omit embedded fields from selector expression.
+        # https://staticcheck.dev/docs/checks/#QF1008
+        - -QF1008
+        # Convert untagged switch to tagged switch.
+        # https://staticcheck.dev/docs/checks/#QF1002
+        - -QF1001
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+    rules:
+      - path: pkg/storage/memorystorage/v2/
+        linters:
+          - unused
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - Standard
+        - Default
+        - Prefix(github.com/clusterpedia-io)
+    goimports:
+      local-prefixes:
+        - github.com/clusterpedia-io
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -268,7 +268,7 @@ clean-controller-manager-manifest:
 .PHONY: golangci-lint
 golangci-lint:
 ifeq (, $(shell which golangci-lint))
-	GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54
+	GO111MODULE=on go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.6
 GOLANGLINT_BIN=$(shell go env GOPATH)/bin/golangci-lint
 else
 GOLANGLINT_BIN=$(shell which golangci-lint)

pkg/apiserver/registry/clusterpedia/resources/rest.go

@@ -53,7 +53,7 @@ func (r *REST) NamespaceScoped() bool {
 }
 
 // GetSingularName implements rest.SingularNameProvider interface
-func (s *REST) GetSingularName() string {
+func (r *REST) GetSingularName() string {
 	return "resources"
 }
 

pkg/kubeapiserver/resourcerest/proxy/subresource.go

@@ -8,7 +8,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/proxy"
 	"k8s.io/apiserver/pkg/registry/rest"
-	registryrest "k8s.io/apiserver/pkg/registry/rest"
 	api "k8s.io/kubernetes/pkg/apis/core"
 )
 
@@ -140,6 +139,6 @@ func (r *PodSubresourceRemoteProxyREST) ConnectMethods() []string {
 	return r.methods
 }
 
-func (r *PodSubresourceRemoteProxyREST) Connect(ctx context.Context, name string, opts runtime.Object, responder registryrest.Responder) (http.Handler, error) {
+func (r *PodSubresourceRemoteProxyREST) Connect(ctx context.Context, name string, opts runtime.Object, responder rest.Responder) (http.Handler, error) {
 	return proxyConn(ctx, r.connGetter, r.upgradeRequired, proxy.NewErrorResponder(responder), nil)
 }

pkg/synchromanager/clustersynchro/cluster_synchro.go

@@ -500,31 +500,31 @@ func (s *ClusterSynchro) runner() {
 	}
 }
 
-func (synchro *ClusterSynchro) startRunner() {
+func (s *ClusterSynchro) startRunner() {
 	select {
-	case <-synchro.stopRunnerCh:
-		synchro.stopRunnerCh = make(chan struct{})
+	case <-s.stopRunnerCh:
+		s.stopRunnerCh = make(chan struct{})
 	default:
 	}
 
 	select {
-	case <-synchro.startRunnerCh:
+	case <-s.startRunnerCh:
 	default:
-		close(synchro.startRunnerCh)
+		close(s.startRunnerCh)
 	}
 }
 
-func (synchro *ClusterSynchro) stopRunner() {
+func (s *ClusterSynchro) stopRunner() {
 	select {
-	case <-synchro.startRunnerCh:
-		synchro.startRunnerCh = make(chan struct{})
+	case <-s.startRunnerCh:
+		s.startRunnerCh = make(chan struct{})
 	default:
 	}
 
 	select {
-	case <-synchro.stopRunnerCh:
+	case <-s.stopRunnerCh:
 	default:
-		close(synchro.stopRunnerCh)
+		close(s.stopRunnerCh)
 	}
 }
 

pkg/synchromanager/clustersynchro_manager.go

@@ -26,7 +26,6 @@ import (
 	metricsstore "k8s.io/kube-state-metrics/v2/pkg/metrics_store"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	"github.com/clusterpedia-io/api/cluster/v1alpha2"
 	clusterv1alpha2 "github.com/clusterpedia-io/api/cluster/v1alpha2"
 	"github.com/clusterpedia-io/clusterpedia/pkg/controller"
 	crdclientset "github.com/clusterpedia-io/clusterpedia/pkg/generated/clientset/versioned"
@@ -403,7 +402,7 @@ func (manager *Manager) reconcileCluster(cluster *clusterv1alpha2.PediaCluster)
 
 	if from := cluster.Spec.AuthenticationFrom; from != nil {
 		secrets := make(map[string]struct{}, 5)
-		for _, source := range []*v1alpha2.ClusterAuthenticationSource{
+		for _, source := range []*clusterv1alpha2.ClusterAuthenticationSource{
 			from.KubeConfig, from.CA, from.Cert, from.Token, from.Key,
 		} {
 			if source != nil {