(Follow up of : kubernetes-sigs#4752 - Upgrade GolangCI) - fix staticcheck linter issues in the scaffolds and tutorials

camilamacedo86 · camilamacedo86 · commit 5aa85ad24ff0 · 2025-04-11T00:35:45.000+01:00
Co-Author: dongjiang &lt;dongjiang1989@126.com&gt;
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/.golangci.yml b/docs/book/src/cronjob-tutorial/testdata/project/.golangci.yml
@@ -39,12 +39,6 @@ linters:
       - linters:
           - staticcheck
         text: "ST1019"
-      - linters:
-          - staticcheck
-        text: "ST1005"
-      - linters:
-          - staticcheck
-        text: "QF1008"
     paths:
       - third_party$
       - builtin$
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller.go b/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller.go
@@ -354,7 +354,7 @@ func (r *CronJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		if cronJob.Status.LastScheduleTime != nil {
 			earliestTime = cronJob.Status.LastScheduleTime.Time
 		} else {
-			earliestTime = cronJob.ObjectMeta.CreationTimestamp.Time
+			earliestTime = cronJob.CreationTimestamp.Time
 		}
 		if cronJob.Spec.StartingDeadlineSeconds != nil {
 			// controller is not going to schedule anything below this point
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/internal/webhook/v1/cronjob_webhook.go b/docs/book/src/cronjob-tutorial/testdata/project/internal/webhook/v1/cronjob_webhook.go
@@ -265,14 +265,14 @@ the validation schema.
 */
 
 func validateCronJobName(cronjob *batchv1.CronJob) *field.Error {
-	if len(cronjob.ObjectMeta.Name) > validationutils.DNS1035LabelMaxLength-11 {
+	if len(cronjob.Name) > validationutils.DNS1035LabelMaxLength-11 {
 		// The job name length is 63 characters like all Kubernetes objects
 		// (which must fit in a DNS subdomain). The cronjob controller appends
 		// a 11-character suffix to the cronjob (`-$TIMESTAMP`) when creating
 		// a job. The job name length limit is 63 characters. Therefore cronjob
 		// names must have length <= 63-11=52. If we don't validate this here,
 		// then job creation will fail later.
-		return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.ObjectMeta.Name, "must be no more than 52 characters")
+		return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.Name, "must be no more than 52 characters")
 	}
 	return nil
 }
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go b/docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go
@@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive,staticcheck
+	. "github.com/onsi/ginkgo/v2" // revive,staticcheck
 )
 
 const (
diff --git a/docs/book/src/getting-started/testdata/project/.golangci.yml b/docs/book/src/getting-started/testdata/project/.golangci.yml
@@ -39,12 +39,6 @@ linters:
       - linters:
           - staticcheck
         text: "ST1019"
-      - linters:
-          - staticcheck
-        text: "ST1005"
-      - linters:
-          - staticcheck
-        text: "QF1008"
     paths:
       - third_party$
       - builtin$
diff --git a/docs/book/src/getting-started/testdata/project/test/utils/utils.go b/docs/book/src/getting-started/testdata/project/test/utils/utils.go
@@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive,staticcheck
+	. "github.com/onsi/ginkgo/v2" // revive,staticcheck
 )
 
 const (
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/.golangci.yml b/docs/book/src/multiversion-tutorial/testdata/project/.golangci.yml
@@ -39,12 +39,6 @@ linters:
       - linters:
           - staticcheck
         text: "ST1019"
-      - linters:
-          - staticcheck
-        text: "ST1005"
-      - linters:
-          - staticcheck
-        text: "QF1008"
     paths:
       - third_party$
       - builtin$
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/internal/controller/cronjob_controller.go b/docs/book/src/multiversion-tutorial/testdata/project/internal/controller/cronjob_controller.go
@@ -354,7 +354,7 @@ func (r *CronJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
 		if cronJob.Status.LastScheduleTime != nil {
 			earliestTime = cronJob.Status.LastScheduleTime.Time
 		} else {
-			earliestTime = cronJob.ObjectMeta.CreationTimestamp.Time
+			earliestTime = cronJob.CreationTimestamp.Time
 		}
 		if cronJob.Spec.StartingDeadlineSeconds != nil {
 			// controller is not going to schedule anything below this point
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/internal/webhook/v1/cronjob_webhook.go b/docs/book/src/multiversion-tutorial/testdata/project/internal/webhook/v1/cronjob_webhook.go
@@ -270,14 +270,14 @@ the validation schema.
 */
 
 func validateCronJobName(cronjob *batchv1.CronJob) *field.Error {
-	if len(cronjob.ObjectMeta.Name) > validationutils.DNS1035LabelMaxLength-11 {
+	if len(cronjob.Name) > validationutils.DNS1035LabelMaxLength-11 {
 		// The job name length is 63 characters like all Kubernetes objects
 		// (which must fit in a DNS subdomain). The cronjob controller appends
 		// a 11-character suffix to the cronjob (`-$TIMESTAMP`) when creating
 		// a job. The job name length limit is 63 characters. Therefore cronjob
 		// names must have length <= 63-11=52. If we don't validate this here,
 		// then job creation will fail later.
-		return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.ObjectMeta.Name, "must be no more than 52 characters")
+		return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.Name, "must be no more than 52 characters")
 	}
 	return nil
 }
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/internal/webhook/v2/cronjob_webhook.go b/docs/book/src/multiversion-tutorial/testdata/project/internal/webhook/v2/cronjob_webhook.go
@@ -173,8 +173,8 @@ func validateCronJob(cronjob *batchv2.CronJob) error {
 }
 
 func validateCronJobName(cronjob *batchv2.CronJob) *field.Error {
-	if len(cronjob.ObjectMeta.Name) > validationutils.DNS1035LabelMaxLength-11 {
-		return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.ObjectMeta.Name, "must be no more than 52 characters")
+	if len(cronjob.Name) > validationutils.DNS1035LabelMaxLength-11 {
+		return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.Name, "must be no more than 52 characters")
 	}
 	return nil
 }
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go b/docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go
@@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive,staticcheck
+	. "github.com/onsi/ginkgo/v2" // revive,staticcheck
 )
 
 const (
diff --git a/hack/docs/internal/cronjob-tutorial/controller_implementation.go b/hack/docs/internal/cronjob-tutorial/controller_implementation.go
@@ -343,7 +343,7 @@ const controllerReconcileLogic = `log := logf.FromContext(ctx)
 		if cronJob.Status.LastScheduleTime != nil {
 			earliestTime = cronJob.Status.LastScheduleTime.Time
 		} else {
-			earliestTime = cronJob.ObjectMeta.CreationTimestamp.Time
+			earliestTime = cronJob.CreationTimestamp.Time
 		}
 		if cronJob.Spec.StartingDeadlineSeconds != nil {
 			// controller is not going to schedule anything below this point
diff --git a/hack/docs/internal/cronjob-tutorial/webhook_implementation.go b/hack/docs/internal/cronjob-tutorial/webhook_implementation.go
@@ -164,14 +164,14 @@ the validation schema.
 */
 
 func validateCronJobName(cronjob *batchv1.CronJob) *field.Error {
-	if len(cronjob.ObjectMeta.Name) > validationutils.DNS1035LabelMaxLength-11 {
+	if len(cronjob.Name) > validationutils.DNS1035LabelMaxLength-11 {
 		// The job name length is 63 characters like all Kubernetes objects
 		// (which must fit in a DNS subdomain). The cronjob controller appends
 		// a 11-character suffix to the cronjob (` + "`" + `-$TIMESTAMP` + "`" + `) when creating
 		// a job. The job name length limit is 63 characters. Therefore cronjob
 		// names must have length <= 63-11=52. If we don't validate this here,
 		// then job creation will fail later.
-		return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.ObjectMeta.Name, "must be no more than 52 characters")
+		return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.Name, "must be no more than 52 characters")
 	}
 	return nil
 }
diff --git a/hack/docs/internal/multiversion-tutorial/webhook_v2_implementaton.go b/hack/docs/internal/multiversion-tutorial/webhook_v2_implementaton.go
@@ -66,8 +66,8 @@ func validateCronJob(cronjob *batchv2.CronJob) error {
 }
 
 func validateCronJobName(cronjob *batchv2.CronJob) *field.Error {
-	if len(cronjob.ObjectMeta.Name) > validationutils.DNS1035LabelMaxLength-11 {
-		return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.ObjectMeta.Name, "must be no more than 52 characters")
+	if len(cronjob.Name) > validationutils.DNS1035LabelMaxLength-11 {
+		return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.Name, "must be no more than 52 characters")
 	}
 	return nil
 }
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/golangci.go
@@ -82,12 +82,6 @@ linters:
       - linters:
           - staticcheck
         text: "ST1019"
-      - linters:
-          - staticcheck
-        text: "ST1005"
-      - linters:
-          - staticcheck
-        text: "QF1008"
     paths:
       - third_party$
       - builtin$
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go
@@ -52,7 +52,7 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive,staticcheck
+	. "github.com/onsi/ginkgo/v2" // revive,staticcheck
 )
 
 const (
diff --git a/testdata/project-v4-multigroup/.golangci.yml b/testdata/project-v4-multigroup/.golangci.yml
@@ -39,12 +39,6 @@ linters:
       - linters:
           - staticcheck
         text: "ST1019"
-      - linters:
-          - staticcheck
-        text: "ST1005"
-      - linters:
-          - staticcheck
-        text: "QF1008"
     paths:
       - third_party$
       - builtin$
diff --git a/testdata/project-v4-multigroup/test/utils/utils.go b/testdata/project-v4-multigroup/test/utils/utils.go
@@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive,staticcheck
+	. "github.com/onsi/ginkgo/v2" // revive,staticcheck
 )
 
 const (
diff --git a/testdata/project-v4-with-plugins/.golangci.yml b/testdata/project-v4-with-plugins/.golangci.yml
@@ -39,12 +39,6 @@ linters:
       - linters:
           - staticcheck
         text: "ST1019"
-      - linters:
-          - staticcheck
-        text: "ST1005"
-      - linters:
-          - staticcheck
-        text: "QF1008"
     paths:
       - third_party$
       - builtin$
diff --git a/testdata/project-v4-with-plugins/test/utils/utils.go b/testdata/project-v4-with-plugins/test/utils/utils.go
@@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive,staticcheck
+	. "github.com/onsi/ginkgo/v2" // revive,staticcheck
 )
 
 const (
diff --git a/testdata/project-v4/.golangci.yml b/testdata/project-v4/.golangci.yml
@@ -39,12 +39,6 @@ linters:
       - linters:
           - staticcheck
         text: "ST1019"
-      - linters:
-          - staticcheck
-        text: "ST1005"
-      - linters:
-          - staticcheck
-        text: "QF1008"
     paths:
       - third_party$
       - builtin$
diff --git a/testdata/project-v4/test/utils/utils.go b/testdata/project-v4/test/utils/utils.go
@@ -24,7 +24,7 @@ import (
 	"os/exec"
 	"strings"
 
-	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive,staticcheck
+	. "github.com/onsi/ginkgo/v2" // revive,staticcheck
 )
 
 const (

Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ func (r *CronJobReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct`
`354`	`354`	`if cronJob.Status.LastScheduleTime != nil {`
`355`	`355`	`earliestTime = cronJob.Status.LastScheduleTime.Time`
`356`	`356`	`} else {`
`357`		`- earliestTime = cronJob.ObjectMeta.CreationTimestamp.Time`
	`357`	`+ earliestTime = cronJob.CreationTimestamp.Time`
`358`	`358`	`}`
`359`	`359`	`if cronJob.Spec.StartingDeadlineSeconds != nil {`
`360`	`360`	`// controller is not going to schedule anything below this point`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"os/exec"`
`25`	`25`	`"strings"`
`26`	`26`
`27`		`- . "github.com/onsi/ginkgo/v2" //nolint:golint,revive,staticcheck`
	`27`	`+ . "github.com/onsi/ginkgo/v2" // revive,staticcheck`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,8 @@ func validateCronJob(cronjob *batchv2.CronJob) error {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`func validateCronJobName(cronjob batchv2.CronJob) field.Error {`
`176`		`- if len(cronjob.ObjectMeta.Name) > validationutils.DNS1035LabelMaxLength-11 {`
`177`		`- return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.ObjectMeta.Name, "must be no more than 52 characters")`
	`176`	`+ if len(cronjob.Name) > validationutils.DNS1035LabelMaxLength-11 {`
	`177`	`+ return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.Name, "must be no more than 52 characters")`
`178`	`178`	`}`
`179`	`179`	`return nil`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
@@ -343,7 +343,7 @@ const controllerReconcileLogic = `log := logf.FromContext(ctx)
`343`	`343`	`if cronJob.Status.LastScheduleTime != nil {`
`344`	`344`	`earliestTime = cronJob.Status.LastScheduleTime.Time`
`345`	`345`	`} else {`
`346`		`- earliestTime = cronJob.ObjectMeta.CreationTimestamp.Time`
	`346`	`+ earliestTime = cronJob.CreationTimestamp.Time`
`347`	`347`	`}`
`348`	`348`	`if cronJob.Spec.StartingDeadlineSeconds != nil {`
`349`	`349`	`// controller is not going to schedule anything below this point`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ func validateCronJob(cronjob *batchv2.CronJob) error {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`func validateCronJobName(cronjob batchv2.CronJob) field.Error {`
`69`		`- if len(cronjob.ObjectMeta.Name) > validationutils.DNS1035LabelMaxLength-11 {`
`70`		`- return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.ObjectMeta.Name, "must be no more than 52 characters")`
	`69`	`+ if len(cronjob.Name) > validationutils.DNS1035LabelMaxLength-11 {`
	`70`	`+ return field.Invalid(field.NewPath("metadata").Child("name"), cronjob.Name, "must be no more than 52 characters")`
`71`	`71`	`}`
`72`	`72`	`return nil`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ import (`
`52`	`52`	`"os/exec"`
`53`	`53`	`"strings"`
`54`	`54`
`55`		`- . "github.com/onsi/ginkgo/v2" //nolint:golint,revive,staticcheck`
	`55`	`+ . "github.com/onsi/ginkgo/v2" // revive,staticcheck`
`56`	`56`	`)`
`57`	`57`
`58`	`58`	`const (`