Merge branch 'main' into feature/config-manager-migration-phase3-kbagent-integratio

leon-ape · leon-ape · commit 6012c416d8ce · 2026-01-30T16:28:43.000+08:00
diff --git a/.github/workflows/cicd-pull-request.yml b/.github/workflows/cicd-pull-request.yml
@@ -80,7 +80,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ops: [ 'manifests', 'mod-vendor', 'generate', 'lint', 'staticcheck', 'test' ]
+        ops: [ 'manifests', 'mod-vendor', 'generate', 'lint', 'test' ]
     steps:
       - uses: actions/checkout@v4
       - name: install lib
@@ -99,7 +99,7 @@ jobs:
       - name: Install golangci-lint
         if: matrix.ops == 'lint'
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.5
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.8.0
 
       - name: make ${{ matrix.ops }}
         run: |
diff --git a/.github/workflows/cicd-push.yml b/.github/workflows/cicd-push.yml
@@ -105,7 +105,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ops: [ 'manifests', 'mod-vendor', 'generate', 'lint', 'staticcheck', 'test' ]
+        ops: [ 'manifests', 'mod-vendor', 'generate', 'lint', 'test' ]
     steps:
       - uses: actions/checkout@v4
       - name: install lib
@@ -124,7 +124,7 @@ jobs:
       - name: Install golangci-lint
         if: matrix.ops == 'lint'
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.5
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.8.0
 
       - name: make ${{ matrix.ops }}
         run: |
diff --git a/.github/workflows/release-version.yml b/.github/workflows/release-version.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ops: [ 'manifests', 'mod-vendor', 'generate', 'lint', 'staticcheck', 'test' ]
+        ops: [ 'manifests', 'mod-vendor', 'generate', 'lint', 'test' ]
     steps:
       - uses: actions/checkout@v4
       - name: install lib
@@ -47,7 +47,7 @@ jobs:
       - name: Install golangci-lint
         if: matrix.ops == 'lint'
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.5
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.8.0
 
       - name: make ${{ matrix.ops }}
         run: |
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,52 +1,54 @@
-# options for analysis running
+version: "2"
 run:
-  # default concurrency is a available CPU number
-  concurrency: 4
-
-  # timeout for analysis, e.g. 30s, 5m, default is 1m
-  deadline: 15m
-
-  timeout: 30m
-
-issues:
-  exclude-files:
-    - "^zz_generated.*"
-
-#  build-tags:
-#    - containers_image_openpgp
-
 output:
-  # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
   formats:
-    - format: colored-line-number
+    text:
       path: stdout
-
-  # print lines of code with issue, default is true
-  print-issued-lines: true
-
-  # print linter name in the end of issue text, default is true
-  print-linter-name: true
-
-# check available linters @ https://golangci-lint.run/usage/linters/
+      print-linter-name: true
+      print-issued-lines: true
 linters:
-  disable-all: true
-  enable: # please keep this alphabetized
-  # - gocyclo
-    - loggercheck
+  default: none
+  enable:
     - errcheck
     - gocritic
-    # - goconst
-    - goimports
-    - gofmt  # We enable this as well as goimports for its simplify mode.
-    - gosimple
     - govet
     - ineffassign
-    - typecheck
+    - loggercheck
     - misspell
     - nakedret
+    - staticcheck
     - unconvert
     - unused
-
-linters-settings:
-  errcheck:
-    check-blank: false # to keep `_ = viper.BindPFlag(...)` from throwing errors
+  settings:
+    errcheck:
+      check-blank: false
+    staticcheck:
+      checks:
+        - all
+        - '-ST1001' # Dot imports are discouraged
+        - '-SA1019' # Using a deprecated function, variable, constant or field
+        - '-QF1008' # Omit embedded fields from selector expression
+        - '-QF1001' # Apply De Morgan’s law
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - ^zz_generated.*
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+    - goimports
+  exclusions:
+    generated: lax
+    paths:
+      - ^zz_generated.*
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/Makefile b/Makefile
@@ -145,7 +145,7 @@ vet: test-go-generate ## Run go vet against code.
 	GOOS=$(GOOS) $(GO) vet -mod=mod ./...
 
 .PHONY: lint-fast
-lint-fast: staticcheck vet golangci-lint # [INTERNAL] Run all lint job against code.
+lint-fast: vet golangci-lint # [INTERNAL] Run all lint job against code.
 
 .PHONY: lint
 lint: test-go-generate generate ## Run default lint job against code.
@@ -155,10 +155,6 @@ lint: test-go-generate generate ## Run default lint job against code.
 golangci-lint: golangci-lint-bin generate ## Run golangci-lint against code.
 	$(GOLANGCILINT) run ./...
 
-.PHONY: staticcheck
-staticcheck: staticcheck-bin test-go-generate generate ## Run staticcheck against code.
-	$(STATICCHECK) ./...
-
 .PHONY: build-checks
 build-checks: fmt vet goimports lint-fast ## Run build checks.
 
@@ -386,7 +382,7 @@ controller-gen: $(LOCALBIN) ## Download controller-gen locally if necessary.
 envtest: $(LOCALBIN) ## Download envtest-setup locally if necessary.
 	$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest,$(ENVTEST_VERSION))
 
-GOLANGCILINT_VERSION = v1.64.8
+GOLANGCILINT_VERSION = v2.8.0
 GOLANGCILINT = $(LOCALBIN)/golangci-lint-$(GOLANGCILINT_VERSION)
 .PHONY: golangci-lint-bin
 golangci-lint-bin: $(LOCALBIN) ## Download golangci-lint locally if necessary.
@@ -396,12 +392,6 @@ golangci-lint-bin: $(LOCALBIN) ## Download golangci-lint locally if necessary.
 		mv "$(LOCALBIN)/golangci-lint" "$(GOLANGCILINT)"; \
 	}
 
-STATICCHECK_VERSION = v0.6.1
-STATICCHECK = $(LOCALBIN)/staticcheck-$(STATICCHECK_VERSION)
-.PHONY: staticcheck-bin
-staticcheck-bin: $(LOCALBIN) ## Download staticcheck locally if necessary.
-	$(call go-install-tool,$(STATICCHECK),honnef.co/go/tools/cmd/staticcheck,$(STATICCHECK_VERSION))
-
 GOIMPORTS_VERSION = v0.34.0
 GOIMPORTS = $(LOCALBIN)/goimports-$(GOIMPORTS_VERSION)
 .PHONY: goimports-bin
diff --git a/apis/apps/v1alpha1/type.go b/apis/apps/v1alpha1/type.go
@@ -109,6 +109,7 @@ type ConfigTemplateExtension struct {
 }
 
 // LegacyRenderedTemplateSpec describes the configuration extension for the lazy rendered template.
+//
 // Deprecated: LegacyRenderedTemplateSpec has been deprecated since 0.9.0 and will be removed in 0.10.0
 type LegacyRenderedTemplateSpec struct {
 	// Extends the configuration template.
diff --git a/apis/workloads/v1alpha1/instanceset_types.go b/apis/workloads/v1alpha1/instanceset_types.go
@@ -27,6 +27,7 @@ import (
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
 // SchedulingPolicy the scheduling policy.
+//
 // Deprecated: Unify with apps/v1alpha1.SchedulingPolicy
 type SchedulingPolicy struct {
 	// If specified, the Pod will be dispatched by specified scheduler.
diff --git a/controllers/trace/reconciler_tree.go b/controllers/trace/reconciler_tree.go
@@ -653,9 +653,10 @@ func (r *jobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R
 		}
 		// Update job status based on pod completion
 		if err = r.Get(ctx, client.ObjectKeyFromObject(pod), pod); err == nil {
-			if pod.Status.Phase == corev1.PodSucceeded {
+			switch pod.Status.Phase {
+			case corev1.PodSucceeded:
 				job.Status.Succeeded++
-			} else if pod.Status.Phase == corev1.PodFailed {
+			case corev1.PodFailed:
 				job.Status.Failed++
 			}
 		}
diff --git a/docker/Dockerfile-dev b/docker/Dockerfile-dev
@@ -14,7 +14,7 @@ ARG INSTALL_ZSH="true"
 ARG KUBECTL_VERSION="latest"
 ARG HELM_VERSION="latest"
 ARG MINIKUBE_VERSION="latest"
-ARG GOLANGCI_LINT_VERSION="1.64.5"
+ARG GOLANGCI_LINT_VERSION="2.8.0"
 
 ARG USERNAME=kubeblocks
 ARG USER_UID=1000
diff --git a/docs/developer_docs/api-reference/cluster.md b/docs/developer_docs/api-reference/cluster.md
@@ -25053,8 +25053,8 @@ It is required when the issuer is set to <code>UserProvided</code>.</p>
 (<em>Appears on:</em><a href="#apps.kubeblocks.io/v1alpha1.ComponentConfigSpec">ComponentConfigSpec</a>)
 </p>
 <div>
-<p>LegacyRenderedTemplateSpec describes the configuration extension for the lazy rendered template.
-Deprecated: LegacyRenderedTemplateSpec has been deprecated since 0.9.0 and will be removed in 0.10.0</p>
+<p>LegacyRenderedTemplateSpec describes the configuration extension for the lazy rendered template.</p>
+<p>Deprecated: LegacyRenderedTemplateSpec has been deprecated since 0.9.0 and will be removed in 0.10.0</p>
 </div>
 <table>
 <thead>
@@ -36411,8 +36411,8 @@ RoleUpdateMechanism
 (<em>Appears on:</em><a href="#workloads.kubeblocks.io/v1alpha1.InstanceTemplate">InstanceTemplate</a>)
 </p>
 <div>
-<p>SchedulingPolicy the scheduling policy.
-Deprecated: Unify with apps/v1alpha1.SchedulingPolicy</p>
+<p>SchedulingPolicy the scheduling policy.</p>
+<p>Deprecated: Unify with apps/v1alpha1.SchedulingPolicy</p>
 </div>
 <table>
 <thead>
diff --git a/pkg/controller/instance/reconciler_update.go b/pkg/controller/instance/reconciler_update.go
@@ -136,7 +136,8 @@ func (r *updateReconciler) Reconcile(tree *kubebuilderx.ObjectTree) (kubebuilder
 		if updatePolicy == inPlaceUpdatePolicy && specUpdatePolicy == kbappsv1.ReCreatePodUpdatePolicyType {
 			updatePolicy = recreatePolicy
 		}
-		if updatePolicy == inPlaceUpdatePolicy {
+		switch updatePolicy {
+		case inPlaceUpdatePolicy:
 			newPod, err := buildInstancePod(inst, getPodRevision(pod))
 			if err != nil {
 				return kubebuilderx.Continue, err
@@ -161,7 +162,7 @@ func (r *updateReconciler) Reconcile(tree *kubebuilderx.ObjectTree) (kubebuilder
 			if err != nil {
 				return kubebuilderx.Continue, err
 			}
-		} else if updatePolicy == recreatePolicy {
+		case recreatePolicy:
 			if !isTerminating(pod) {
 				if err = r.switchover(tree, inst, pod); err != nil {
 					return kubebuilderx.Continue, err
diff --git a/pkg/controller/instanceset/reconciler_update.go b/pkg/controller/instanceset/reconciler_update.go
@@ -164,7 +164,8 @@ func (r *updateReconciler) Reconcile(tree *kubebuilderx.ObjectTree) (kubebuilder
 		if updatePolicy == inPlaceUpdatePolicy && specUpdatePolicy == kbappsv1.ReCreatePodUpdatePolicyType {
 			updatePolicy = recreatePolicy
 		}
-		if updatePolicy == inPlaceUpdatePolicy {
+		switch updatePolicy {
+		case inPlaceUpdatePolicy:
 			newPod, err := buildInstancePodByTemplate(pod.Name, nameToTemplateMap[pod.Name], its, getPodRevision(pod))
 			if err != nil {
 				return kubebuilderx.Continue, err
@@ -190,7 +191,7 @@ func (r *updateReconciler) Reconcile(tree *kubebuilderx.ObjectTree) (kubebuilder
 				return kubebuilderx.Continue, err
 			}
 			updatingPods++
-		} else if updatePolicy == recreatePolicy {
+		case recreatePolicy:
 			if !isTerminating(pod) {
 				if err = r.switchover(tree, its, pod); err != nil {
 					return kubebuilderx.Continue, err
diff --git a/pkg/controller/model/graph_client.go b/pkg/controller/model/graph_client.go
@@ -137,8 +137,8 @@ func (r *realGraphClient) Do(dag *graph.DAG, objOld, objNew client.Object, actio
 		ClientOpt:         graphOpts.clientOpt,
 		PropagationPolicy: graphOpts.propagationPolicy,
 	}
-	switch {
-	case parent == nil:
+	switch parent {
+	case nil:
 		dag.AddConnectRoot(vertex)
 	default:
 		dag.AddConnect(parent, vertex)
diff --git a/pkg/kbagent/util/event.go b/pkg/kbagent/util/event.go
@@ -140,6 +140,6 @@ func getK8sClientSet() (*kubernetes.Clientset, error) {
 
 func generateEventName(reason, message string) string {
 	hash := fnv.New32a()
-	hash.Write([]byte(fmt.Sprintf("%s.%s.%s", podUID(), reason, message)))
+	fmt.Fprintf(hash, "%s.%s.%s", podUID(), reason, message)
 	return fmt.Sprintf("%s.%x", podName(), hash.Sum32())
 }
diff --git a/pkg/operations/backup.go b/pkg/operations/backup.go
@@ -92,9 +92,10 @@ func (b BackupOpsHandler) ReconcileAction(reqCtx intctrlutil.RequestCtx, cli cli
 	}
 	// check backup status
 	phase := backups.Items[0].Status.Phase
-	if phase == dpv1alpha1.BackupPhaseCompleted {
+	switch phase {
+	case dpv1alpha1.BackupPhaseCompleted:
 		return opsv1alpha1.OpsSucceedPhase, 0, nil
-	} else if phase == dpv1alpha1.BackupPhaseFailed {
+	case dpv1alpha1.BackupPhaseFailed:
 		return opsv1alpha1.OpsFailedPhase, 0, fmt.Errorf("backup failed")
 	}
 	return opsv1alpha1.OpsRunningPhase, 0, nil
diff --git a/pkg/unstructured/redis_config.go b/pkg/unstructured/redis_config.go
@@ -124,7 +124,7 @@ func (r *redisConfig) GetString(key string) (string, error) {
 	res := make([]string, 0)
 	for i := len(keys); i < len(item.Values); i++ {
 		v := item.Values[i]
-		if ContainerEscapeString(v) {
+		if v == "" || ContainerEscapeString(v) {
 			res = append(res, strconv.Quote(v))
 		} else {
 			res = append(res, v)
diff --git a/staticcheck.conf b/staticcheck.conf

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ type ConfigTemplateExtension struct {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`// LegacyRenderedTemplateSpec describes the configuration extension for the lazy rendered template.`
	`112`	`+//`
`112`	`113`	`// Deprecated: LegacyRenderedTemplateSpec has been deprecated since 0.9.0 and will be removed in 0.10.0`
`113`	`114`	`type LegacyRenderedTemplateSpec struct {`
`114`	`115`	`// Extends the configuration template.`
Original file line number	Diff line number	Diff line change
`@@ -653,9 +653,10 @@ func (r *jobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.R`
`653`	`653`	`}`
`654`	`654`	`// Update job status based on pod completion`
`655`	`655`	`if err = r.Get(ctx, client.ObjectKeyFromObject(pod), pod); err == nil {`
`656`		`- if pod.Status.Phase == corev1.PodSucceeded {`
	`656`	`+ switch pod.Status.Phase {`
	`657`	`+ case corev1.PodSucceeded:`
`657`	`658`	`job.Status.Succeeded++`
`658`		`- } else if pod.Status.Phase == corev1.PodFailed {`
	`659`	`+ case corev1.PodFailed:`
`659`	`660`	`job.Status.Failed++`
`660`	`661`	`}`
`661`	`662`	`}`