✨ (go/v4): Upgrade golangci-lint to v2.7.2 and add modernize check (#5258)

add golangci-lint and support modernize lint

Signed-off-by: dongjiang1989 <dongjiang1989@126.com>

Author: dongjiang1989

.github/workflows/lint-sample.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Run linter
         uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.6.0
+          version: v2.7.2
           working-directory: ${{ matrix.folder }}
       - name: Run linter via makefile target
         working-directory: ${{ matrix.folder }}

.github/workflows/lint.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Run linter
         uses: golangci/golangci-lint-action@v9
         with:
-          version: v2.6.0
+          version: v2.7.2
 
   yamllint:
     runs-on: ubuntu-latest

.golangci.yml

@@ -16,6 +16,7 @@ linters:
     - importas
     - ineffassign
     - lll
+    - modernize
     - misspell
     - nakedret
     - nolintlint
@@ -52,6 +53,12 @@ linters:
           alias: golangv4
         - pkg: sigs.k8s.io/kubebuilder/v4/pkg/plugins/common/kustomize/v2
           alias: kustomizecommonv2
+    modernize:
+      disable:
+      # Suggest replacing omitempty with omitzero for struct fields.
+      # Disable this check for now since it introduces too many changes in our existing codebase.
+      # See https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/modernize#hdr-Analyzer_omitzero for more details.
+        - omitzero
     nolintlint:
       allow-unused: false
     revive:

Makefile

@@ -233,7 +233,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 
 ## Tool Versions
 GO_APIDIFF_VERSION ?= v0.8.3
-GOLANGCI_LINT_VERSION ?= v2.6.0
+GOLANGCI_LINT_VERSION ?= v2.7.2
 
 # go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist
 # $1 - target path with name of binary

docs/book/src/cronjob-tutorial/testdata/project/.github/workflows/lint.yml

@@ -20,4 +20,4 @@ jobs:
       - name: Run linter
         uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.6.0
+          version: v2.7.2

docs/book/src/cronjob-tutorial/testdata/project/.golangci.yml

@@ -13,6 +13,7 @@ linters:
     - govet
     - ineffassign
     - lll
+    - modernize
     - misspell
     - nakedret
     - prealloc
@@ -26,6 +27,9 @@ linters:
       rules:
         - name: comment-spacings
         - name: import-shadowing
+    modernize:
+      disable:
+        - omitzero
   exclusions:
     generated: lax
     rules:

docs/book/src/cronjob-tutorial/testdata/project/Makefile

@@ -204,7 +204,7 @@ ENVTEST_K8S_VERSION ?= $(shell v='$(call gomodver,k8s.io/api)'; \
   [ -n "$$v" ] || { echo "Set ENVTEST_K8S_VERSION manually (k8s.io/api replace has no tag)" >&2; exit 1; }; \
   printf '%s\n' "$$v" | sed -E 's/^v?[0-9]+\.([0-9]+).*/1.\1/')
 
-GOLANGCI_LINT_VERSION ?= v2.6.0
+GOLANGCI_LINT_VERSION ?= v2.7.2
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
 $(KUSTOMIZE): $(LOCALBIN)

docs/book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller.go

@@ -25,6 +25,7 @@ package controller
 import (
 	"context"
 	"fmt"
+	"maps"
 	"sort"
 	"time"
 
@@ -602,13 +603,9 @@ func (r *CronJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 			},
 			Spec: *cronJob.Spec.JobTemplate.Spec.DeepCopy(),
 		}
-		for k, v := range cronJob.Spec.JobTemplate.Annotations {
-			job.Annotations[k] = v
-		}
+		maps.Copy(job.Annotations, cronJob.Spec.JobTemplate.Annotations)
 		job.Annotations[scheduledTimeAnnotation] = scheduledTime.Format(time.RFC3339)
-		for k, v := range cronJob.Spec.JobTemplate.Labels {
-			job.Labels[k] = v
-		}
+		maps.Copy(job.Labels, cronJob.Spec.JobTemplate.Labels)
 		if err := ctrl.SetControllerReference(cronJob, job, r.Scheme); err != nil {
 			return nil, err
 		}

docs/book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller_test.go

@@ -172,7 +172,7 @@ var _ = Describe("CronJob controller", func() {
 			}
 
 			// Note that your CronJob’s GroupVersionKind is required to set up this owner reference.
-			kind := reflect.TypeOf(cronjobv1.CronJob{}).Name()
+			kind := reflect.TypeFor[cronjobv1.CronJob]().Name()
 			gvk := cronjobv1.GroupVersion.WithKind(kind)
 
 			controllerRef := metav1.NewControllerRef(createdCronjob, gvk)

docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go

@@ -201,8 +201,8 @@ func LoadImageToKindClusterWithName(name string) error {
 // according to line breakers, and ignores the empty elements in it.
 func GetNonEmptyLines(output string) []string {
 	var res []string
-	elements := strings.Split(output, "\n")
-	for _, element := range elements {
+	elements := strings.SplitSeq(output, "\n")
+	for element := range elements {
 		if element != "" {
 			res = append(res, element)
 		}