Repository: kubernetes-sigs/kubebuilder (language: go)

Issue:
Evaludate and Apply Latest Lint Rules and Features
### What do you want to happen?

It turns out there's a long history ever since `golangci-lint` [was introduced](https://github.com/kubernetes-sigs/kubebuilder/commit/887037d09add306a138f2935eedd9b30f06e5aa6).
I would suggest re-evaluating the usage of lint tools to ensure adherence to the best practices of Golang coding.

Suggestion:
1. Check [the config of `revive`](https://github.com/kubernetes-sigs/kubebuilder/blob/cc338d729c2a578ae491860e3eb71e63864b1390/.golangci.yml#L22-L58).
   1. Any options can be dropped?
   2. Any new features can be added?
   3. Why there are some *disabled*, it is necessary still?
1. Check the latest feature of `golangci-lint`
1. Update the code if necessary


### Extra Labels

/kind cleanup


Discussion / hints:
@camilamacedo86 I'm not sure how to tag, this seems not suitable to be `kind/feature`. And we may consider it as `good-first-issue` :)
I think kind/cleanup is OK. 🥇 

If the motivation came from the bump https://github.com/kubernetes-sigs/kubebuilder/pull/3846
see that the fixes applied are accurate.

- We should not use `.` to import but we have one exception then in this case we need configure to ignore
- When args are not used we should use `_` 

That are the only checks that the whole code and samples fails after the update and seems that is more related those files are been ignored before in the lint instead of changes in the lint persei. 

I think that the only thing that we could do is to check if we can ignore the specific scenario

```
	// nolint:revive
	. "github.com/onsi/ginkgo/v2"
	// nolint:revive
	. "github.com/onsi/gomega"
```

Via config like

```
[rule.dot-imports]
  arguments = [{ allowedPackages = ["github.com/onsi/ginkgo/v2","github.com/onsi/gomega"] }]
```

As you suggested. But the checks shows fine. 
Wdyt? Also, I agree with you. If the goal here is to do this change only I think it is a `good-first-issue` (adding the label :-) )
Hey @camilamacedo86 and @Kavinjsir, I'm interested. Could you please guide me on this issue?

Thank you!

/assign
@camilamacedo86 Sounds good to me!

> - We should not use . to import but we have one exception then in this case we need configure to ignore

To stay align with your concern, we may add comment like:

```yaml
[rule.dot-imports]
  # dot import should be ONLY allowed for ginkgo testing packages
  arguments = [{ allowedPackages = ["github.com/onsi/ginkgo/v2","github.com/onsi/gomega"] }]
```

Fix patch:
diff --git a/.golangci.yml b/.golangci.yml
index b11f9d38ca3..db63cd4588d 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -26,6 +26,11 @@ linters-settings:
       - name: context-as-argument
       - name: context-keys-type
       - name: dot-imports
+        arguments:
+          # dot import should be ONLY allowed for ginkgo testing packages
+          allowedPackages:
+            - "github.com/onsi/ginkgo/v2"
+            - "github.com/onsi/gomega"
       - name: error-return
       - name: error-strings
       - name: error-naming


Test patch:
diff --git a/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_suite_test.go b/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_suite_test.go
index 6b2671bd50c..a2d85acad7b 100644
--- a/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_suite_test.go
+++ b/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_test.go b/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_test.go
index 171480b4356..1193e5f1532 100644
--- a/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_test.go
+++ b/docs/book/src/component-config-tutorial/testdata/project/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"tutorial.kubebuilder.io/project/test/utils"
diff --git a/docs/book/src/component-config-tutorial/testdata/project/test/utils/utils.go b/docs/book/src/component-config-tutorial/testdata/project/test/utils/utils.go
index 6ad98ac1159..31454d2fc4a 100644
--- a/docs/book/src/component-config-tutorial/testdata/project/test/utils/utils.go
+++ b/docs/book/src/component-config-tutorial/testdata/project/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/api/v1/cronjob_webhook_test.go b/docs/book/src/cronjob-tutorial/testdata/project/api/v1/cronjob_webhook_test.go
index 47913d5e449..4584d9b0cf1 100644
--- a/docs/book/src/cronjob-tutorial/testdata/project/api/v1/cronjob_webhook_test.go
+++ b/docs/book/src/cronjob-tutorial/testdata/project/api/v1/cronjob_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go b/docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go
index 403d656e9e5..fb1864f8cbf 100644
--- a/docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go
+++ b/docs/book/src/cronjob-tutorial/testdata/project/api/v1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller_test.go b/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller_test.go
index 2497d047831..6afdf8081b0 100644
--- a/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller_test.go
+++ b/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/cronjob_controller_test.go
@@ -29,10 +29,8 @@ import (
 	"reflect"
 	"time"
 
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/suite_test.go b/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/suite_test.go
index 1f18ebbdd2f..1b5f665a1af 100644
--- a/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/suite_test.go
+++ b/docs/book/src/cronjob-tutorial/testdata/project/internal/controller/suite_test.go
@@ -34,9 +34,7 @@ import (
 
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_suite_test.go b/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_suite_test.go
index 6b2671bd50c..a2d85acad7b 100644
--- a/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_suite_test.go
+++ b/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go b/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go
index 171480b4356..1193e5f1532 100644
--- a/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go
+++ b/docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"tutorial.kubebuilder.io/project/test/utils"
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
index 6ad98ac1159..31454d2fc4a 100644
--- a/docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go
+++ b/docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 
diff --git a/docs/book/src/getting-started/testdata/project/internal/controller/memcached_controller_test.go b/docs/book/src/getting-started/testdata/project/internal/controller/memcached_controller_test.go
index ae5935e6a5b..66b20cf0d57 100644
--- a/docs/book/src/getting-started/testdata/project/internal/controller/memcached_controller_test.go
+++ b/docs/book/src/getting-started/testdata/project/internal/controller/memcached_controller_test.go
@@ -23,9 +23,7 @@ import (
 	"time"
 
 	//nolint:golint
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/docs/book/src/getting-started/testdata/project/internal/controller/suite_test.go b/docs/book/src/getting-started/testdata/project/internal/controller/suite_test.go
index a7e2663fa07..baccfcfac33 100644
--- a/docs/book/src/getting-started/testdata/project/internal/controller/suite_test.go
+++ b/docs/book/src/getting-started/testdata/project/internal/controller/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/docs/book/src/getting-started/testdata/project/test/e2e/e2e_suite_test.go b/docs/book/src/getting-started/testdata/project/test/e2e/e2e_suite_test.go
index 6b2671bd50c..a2d85acad7b 100644
--- a/docs/book/src/getting-started/testdata/project/test/e2e/e2e_suite_test.go
+++ b/docs/book/src/getting-started/testdata/project/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go b/docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go
index 648efab6907..c6b17a62f5e 100644
--- a/docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go
+++ b/docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"example.com/memcached/test/utils"
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
index 6ad98ac1159..31454d2fc4a 100644
--- a/docs/book/src/getting-started/testdata/project/test/utils/utils.go
+++ b/docs/book/src/getting-started/testdata/project/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/api/v1/cronjob_webhook_test.go b/docs/book/src/multiversion-tutorial/testdata/project/api/v1/cronjob_webhook_test.go
index 95dfcbcc08f..6ef09d64607 100644
--- a/docs/book/src/multiversion-tutorial/testdata/project/api/v1/cronjob_webhook_test.go
+++ b/docs/book/src/multiversion-tutorial/testdata/project/api/v1/cronjob_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go b/docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go
index 7fb5b99209d..fb1864f8cbf 100644
--- a/docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go
+++ b/docs/book/src/multiversion-tutorial/testdata/project/api/v1/webhook_suite_test.go
@@ -26,9 +26,7 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	admissionv1 "k8s.io/api/admission/v1"
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go b/docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go
index 388893b8458..63eda985753 100644
--- a/docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go
+++ b/docs/book/src/multiversion-tutorial/testdata/project/api/v2/webhook_suite_test.go
@@ -26,9 +26,7 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	admissionv1 "k8s.io/api/admission/v1"
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/internal/controller/suite_test.go b/docs/book/src/multiversion-tutorial/testdata/project/internal/controller/suite_test.go
index b9a79e89ec1..36b040b6c31 100644
--- a/docs/book/src/multiversion-tutorial/testdata/project/internal/controller/suite_test.go
+++ b/docs/book/src/multiversion-tutorial/testdata/project/internal/controller/suite_test.go
@@ -25,9 +25,7 @@ import (
 
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_suite_test.go b/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_suite_test.go
index 6b2671bd50c..a2d85acad7b 100644
--- a/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_suite_test.go
+++ b/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go b/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go
index 171480b4356..1193e5f1532 100644
--- a/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go
+++ b/docs/book/src/multiversion-tutorial/testdata/project/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"tutorial.kubebuilder.io/project/test/utils"
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
index 449e0ec50ac..0c91bc93d22 100644
--- a/docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go
+++ b/docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 
diff --git a/hack/docs/internal/cronjob-tutorial/writing_tests_controller.go b/hack/docs/internal/cronjob-tutorial/writing_tests_controller.go
index d5592f153e6..28f0a11dd13 100644
--- a/hack/docs/internal/cronjob-tutorial/writing_tests_controller.go
+++ b/hack/docs/internal/cronjob-tutorial/writing_tests_controller.go
@@ -47,10 +47,8 @@ import (
 	"reflect"
 	"time"
 
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 	batchv1 "k8s.io/api/batch/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/cli/cli_test.go b/pkg/cli/cli_test.go
index 17897226429..ae5f8c7023f 100644
--- a/pkg/cli/cli_test.go
+++ b/pkg/cli/cli_test.go
@@ -22,9 +22,7 @@ import (
 	"os"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
diff --git a/pkg/cli/completion_test.go b/pkg/cli/completion_test.go
index 7a756368a9b..ab235b4b0f3 100644
--- a/pkg/cli/completion_test.go
+++ b/pkg/cli/completion_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package cli
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/cli/options_test.go b/pkg/cli/options_test.go
index 591494e7f3c..562c562c021 100644
--- a/pkg/cli/options_test.go
+++ b/pkg/cli/options_test.go
@@ -23,9 +23,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
diff --git a/pkg/cli/resource_test.go b/pkg/cli/resource_test.go
index 0a57a4c3f40..817da08173d 100644
--- a/pkg/cli/resource_test.go
+++ b/pkg/cli/resource_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package cli
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
diff --git a/pkg/cli/suite_test.go b/pkg/cli/suite_test.go
index 594817285ce..fa7289dec42 100644
--- a/pkg/cli/suite_test.go
+++ b/pkg/cli/suite_test.go
@@ -19,9 +19,7 @@ package cli
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"
diff --git a/pkg/cli/version_test.go b/pkg/cli/version_test.go
index d072df4bd91..e8f54b0fcd4 100644
--- a/pkg/cli/version_test.go
+++ b/pkg/cli/version_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package cli
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/config/errors_test.go b/pkg/config/errors_test.go
index 57947bccae2..e77faaf1f07 100644
--- a/pkg/config/errors_test.go
+++ b/pkg/config/errors_test.go
@@ -19,9 +19,7 @@ package config
 import (
 	"fmt"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
diff --git a/pkg/config/registry_test.go b/pkg/config/registry_test.go
index 00f3871e30e..11e9ea408cc 100644
--- a/pkg/config/registry_test.go
+++ b/pkg/config/registry_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package config
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/config/store/errors_test.go b/pkg/config/store/errors_test.go
index 96b3afc489e..ef62a6efe93 100644
--- a/pkg/config/store/errors_test.go
+++ b/pkg/config/store/errors_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/config/store/yaml/store_test.go b/pkg/config/store/yaml/store_test.go
index aa1b8464478..d4afb6dad8d 100644
--- a/pkg/config/store/yaml/store_test.go
+++ b/pkg/config/store/yaml/store_test.go
@@ -21,9 +21,7 @@ import (
 	"os"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"github.com/spf13/afero"
 
diff --git a/pkg/config/suite_test.go b/pkg/config/suite_test.go
index 2e9110f6029..697d58bf81e 100644
--- a/pkg/config/suite_test.go
+++ b/pkg/config/suite_test.go
@@ -19,9 +19,7 @@ package config
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/config/v2/config_test.go b/pkg/config/v2/config_test.go
index d9cf965a50d..57d65a6b4fc 100644
--- a/pkg/config/v2/config_test.go
+++ b/pkg/config/v2/config_test.go
@@ -20,9 +20,7 @@ package v2
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
diff --git a/pkg/config/v3/config_test.go b/pkg/config/v3/config_test.go
index e3cc7859534..fc08295597d 100644
--- a/pkg/config/v3/config_test.go
+++ b/pkg/config/v3/config_test.go
@@ -21,9 +21,7 @@ import (
 	"sort"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"
diff --git a/pkg/config/version_test.go b/pkg/config/version_test.go
index d2f61d0bd2e..0fcaad14a60 100644
--- a/pkg/config/version_test.go
+++ b/pkg/config/version_test.go
@@ -19,9 +19,7 @@ package config
 import (
 	"sort"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/stage"
diff --git a/pkg/internal/validation/dns_test.go b/pkg/internal/validation/dns_test.go
index 74e6602f8df..b3ec7925bc7 100644
--- a/pkg/internal/validation/dns_test.go
+++ b/pkg/internal/validation/dns_test.go
@@ -21,9 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/machinery/errors_test.go b/pkg/machinery/errors_test.go
index 9f8e925ccb1..67f1bc1ebc0 100644
--- a/pkg/machinery/errors_test.go
+++ b/pkg/machinery/errors_test.go
@@ -20,9 +20,7 @@ import (
 	"errors"
 	"path/filepath"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/machinery/funcmap_test.go b/pkg/machinery/funcmap_test.go
index 52fd67d214b..375b63d86a3 100644
--- a/pkg/machinery/funcmap_test.go
+++ b/pkg/machinery/funcmap_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package machinery
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/machinery/injector_test.go b/pkg/machinery/injector_test.go
index c834f76d40a..c9c2b76e6e0 100644
--- a/pkg/machinery/injector_test.go
+++ b/pkg/machinery/injector_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package machinery
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"
diff --git a/pkg/machinery/machinery_suite_test.go b/pkg/machinery/machinery_suite_test.go
index 0cfef87dd0e..8d246b82924 100644
--- a/pkg/machinery/machinery_suite_test.go
+++ b/pkg/machinery/machinery_suite_test.go
@@ -19,9 +19,7 @@ package machinery
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/machinery/marker_test.go b/pkg/machinery/marker_test.go
index 0d506350dbd..27a58656e0e 100644
--- a/pkg/machinery/marker_test.go
+++ b/pkg/machinery/marker_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package machinery
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/machinery/mixins_test.go b/pkg/machinery/mixins_test.go
index a5af0f0b466..df43f3a5c03 100644
--- a/pkg/machinery/mixins_test.go
+++ b/pkg/machinery/mixins_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package machinery
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
diff --git a/pkg/machinery/scaffold_test.go b/pkg/machinery/scaffold_test.go
index 192e2af2ea3..6cf14ddebdf 100644
--- a/pkg/machinery/scaffold_test.go
+++ b/pkg/machinery/scaffold_test.go
@@ -18,9 +18,7 @@ import (
 	"errors"
 	"os"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"github.com/spf13/afero"
 
diff --git a/pkg/model/resource/api_test.go b/pkg/model/resource/api_test.go
index 21b2cc062ff..fbce493e50a 100644
--- a/pkg/model/resource/api_test.go
+++ b/pkg/model/resource/api_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package resource
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/model/resource/gvk_test.go b/pkg/model/resource/gvk_test.go
index cb9ae82d638..8b93bef4dd6 100644
--- a/pkg/model/resource/gvk_test.go
+++ b/pkg/model/resource/gvk_test.go
@@ -19,9 +19,7 @@ package resource
 import (
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/model/resource/resource_test.go b/pkg/model/resource/resource_test.go
index 5b104db36e2..5935d02e2f9 100644
--- a/pkg/model/resource/resource_test.go
+++ b/pkg/model/resource/resource_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package resource
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/model/resource/suite_test.go b/pkg/model/resource/suite_test.go
index 2ec6ab86848..bd240d657a9 100644
--- a/pkg/model/resource/suite_test.go
+++ b/pkg/model/resource/suite_test.go
@@ -19,9 +19,7 @@ package resource
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/model/resource/utils_test.go b/pkg/model/resource/utils_test.go
index b9b742ca06e..9e1451a3217 100644
--- a/pkg/model/resource/utils_test.go
+++ b/pkg/model/resource/utils_test.go
@@ -19,9 +19,7 @@ package resource
 import (
 	"path"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/model/resource/webhooks_test.go b/pkg/model/resource/webhooks_test.go
index 8c0973b05ba..4b0d6bd9132 100644
--- a/pkg/model/resource/webhooks_test.go
+++ b/pkg/model/resource/webhooks_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package resource
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/model/stage/stage_test.go b/pkg/model/stage/stage_test.go
index e07f169742e..7368e224ebb 100644
--- a/pkg/model/stage/stage_test.go
+++ b/pkg/model/stage/stage_test.go
@@ -21,7 +21,6 @@ import (
 	"testing"
 
 	g "github.com/onsi/ginkgo/v2" // An alias is required because Context is defined elsewhere in this package.
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/plugin/bundle_test.go b/pkg/plugin/bundle_test.go
index 2c225ffad81..ccb1a41d574 100644
--- a/pkg/plugin/bundle_test.go
+++ b/pkg/plugin/bundle_test.go
@@ -19,9 +19,7 @@ package plugin
 import (
 	"sort"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"
diff --git a/pkg/plugin/errors_test.go b/pkg/plugin/errors_test.go
index 4dd46e8478e..aeea88e281b 100644
--- a/pkg/plugin/errors_test.go
+++ b/pkg/plugin/errors_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package plugin
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/plugin/filter_test.go b/pkg/plugin/filter_test.go
index 464ed0bddd7..626de977736 100644
--- a/pkg/plugin/filter_test.go
+++ b/pkg/plugin/filter_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package plugin
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"
diff --git a/pkg/plugin/helpers_test.go b/pkg/plugin/helpers_test.go
index c26fd4f27aa..f01caa25052 100644
--- a/pkg/plugin/helpers_test.go
+++ b/pkg/plugin/helpers_test.go
@@ -19,9 +19,7 @@ package plugin
 import (
 	"sort"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"
diff --git a/pkg/plugin/suite_test.go b/pkg/plugin/suite_test.go
index 1e0440640b0..0938ede0fac 100644
--- a/pkg/plugin/suite_test.go
+++ b/pkg/plugin/suite_test.go
@@ -19,9 +19,7 @@ package plugin
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"
diff --git a/pkg/plugin/util/exec_test.go b/pkg/plugin/util/exec_test.go
index 81cf554f96c..58d449852ca 100644
--- a/pkg/plugin/util/exec_test.go
+++ b/pkg/plugin/util/exec_test.go
@@ -18,9 +18,7 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/plugin/util/helpers_test.go b/pkg/plugin/util/helpers_test.go
index 69f28991704..62553b9ce9e 100644
--- a/pkg/plugin/util/helpers_test.go
+++ b/pkg/plugin/util/helpers_test.go
@@ -19,9 +19,7 @@ package util
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/plugin/util/util_test.go b/pkg/plugin/util/util_test.go
index fbbb884e20c..e502934a606 100644
--- a/pkg/plugin/util/util_test.go
+++ b/pkg/plugin/util/util_test.go
@@ -17,9 +17,7 @@ import (
 	"os"
 	"path/filepath"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/plugin/version_test.go b/pkg/plugin/version_test.go
index 71d5ce54949..771c7660345 100644
--- a/pkg/plugin/version_test.go
+++ b/pkg/plugin/version_test.go
@@ -19,9 +19,7 @@ package plugin
 import (
 	"sort"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/model/stage"
diff --git a/pkg/plugins/external/external_test.go b/pkg/plugins/external/external_test.go
index 9904eb64c6c..8941a2b19c1 100644
--- a/pkg/plugins/external/external_test.go
+++ b/pkg/plugins/external/external_test.go
@@ -23,9 +23,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"github.com/spf13/afero"
 	"github.com/spf13/pflag"
diff --git a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go
index 860f4b81e4c..47c8e8cc1b3 100644
--- a/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go
+++ b/pkg/plugins/golang/deploy-image/v1alpha1/scaffolds/internal/templates/controllers/controller-test.go
@@ -84,10 +84,8 @@ import (
 	"fmt"
 
 	//nolint:golint
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
diff --git a/pkg/plugins/golang/go_version_test.go b/pkg/plugins/golang/go_version_test.go
index 70dc3d5971b..f67e40728f9 100644
--- a/pkg/plugins/golang/go_version_test.go
+++ b/pkg/plugins/golang/go_version_test.go
@@ -19,9 +19,7 @@ package golang
 import (
 	"sort"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/plugins/golang/options_test.go b/pkg/plugins/golang/options_test.go
index 7e20a20fb74..19301100937 100644
--- a/pkg/plugins/golang/options_test.go
+++ b/pkg/plugins/golang/options_test.go
@@ -19,9 +19,7 @@ package golang
 import (
 	"path"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/config"
diff --git a/pkg/plugins/golang/suite_test.go b/pkg/plugins/golang/suite_test.go
index 33edd2d4638..c38994dd3ce 100644
--- a/pkg/plugins/golang/suite_test.go
+++ b/pkg/plugins/golang/suite_test.go
@@ -19,9 +19,7 @@ package golang
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/pkg/plugins/golang/v2/scaffolds/internal/templates/controllers/controller_suitetest.go b/pkg/plugins/golang/v2/scaffolds/internal/templates/controllers/controller_suitetest.go
index 1b96aa0efbb..d8a0b975050 100644
--- a/pkg/plugins/golang/v2/scaffolds/internal/templates/controllers/controller_suitetest.go
+++ b/pkg/plugins/golang/v2/scaffolds/internal/templates/controllers/controller_suitetest.go
@@ -127,7 +127,6 @@ import (
 	"path/filepath"
 	"testing"
 	. "github.com/onsi/ginkgo"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/api/webhook_suitetest.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/api/webhook_suitetest.go
index 6cb1300c3eb..1a580d09497 100644
--- a/pkg/plugins/golang/v3/scaffolds/internal/templates/api/webhook_suitetest.go
+++ b/pkg/plugins/golang/v3/scaffolds/internal/templates/api/webhook_suitetest.go
@@ -140,10 +140,8 @@ import (
 	"testing"
 	"fmt"
 
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 	%s
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/controllers/controller_suitetest.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/controllers/controller_suitetest.go
index 4b49cbaf7eb..c199d774f1a 100644
--- a/pkg/plugins/golang/v3/scaffolds/internal/templates/controllers/controller_suitetest.go
+++ b/pkg/plugins/golang/v3/scaffolds/internal/templates/controllers/controller_suitetest.go
@@ -131,10 +131,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_suitetest.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_suitetest.go
index b5f241c4ab1..e6039212357 100644
--- a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_suitetest.go
+++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_suitetest.go
@@ -147,10 +147,8 @@ import (
 	"time"
 	"runtime"
 
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 	%s
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_test_template.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_test_template.go
index fb3111b25b0..9a23081f9e9 100644
--- a/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_test_template.go
+++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/api/webhook_test_template.go
@@ -75,7 +75,6 @@ const webhookTestTemplate = `{{ .Boilerplate }}
 package {{ .Resource.Version }}
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go
index 39e80c5c6bb..462989cf6bd 100644
--- a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go
+++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_suitetest.go
@@ -141,10 +141,8 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go
index b250efbc632..abe04cffb8b 100644
--- a/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go
+++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/controllers/controller_test_template.go
@@ -73,11 +73,9 @@ import (
 	{{ if .DoAPI -}}
 	"context"
 	{{- end }}
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 	{{ if .DoAPI -}}
 
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/suite.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/suite.go
index 98471fb365a..5dfe394be1c 100644
--- a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/suite.go
+++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/suite.go
@@ -46,10 +46,8 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 )
 
 // Run e2e tests using the Ginkgo runner.
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go
index a2e09f130f7..54f4b148dbf 100644
--- a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go
+++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go
@@ -48,10 +48,8 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
-	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
-	. "github.com/onsi/gomega"
+    . "github.com/onsi/ginkgo/v2"
+    . "github.com/onsi/gomega"
 	
 	"{{ .Repo }}/test/utils"
 )
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
index 2c744ee4a88..b19f0862189 100644
--- a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go
+++ b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go
@@ -47,7 +47,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 
diff --git a/test/e2e/alphagenerate/e2e_suite_test.go b/test/e2e/alphagenerate/e2e_suite_test.go
index 2a120f4fd55..eab37e6dac4 100644
--- a/test/e2e/alphagenerate/e2e_suite_test.go
+++ b/test/e2e/alphagenerate/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/test/e2e/alphagenerate/generate_test.go b/test/e2e/alphagenerate/generate_test.go
index 1943fe4afad..5745cdad17b 100644
--- a/test/e2e/alphagenerate/generate_test.go
+++ b/test/e2e/alphagenerate/generate_test.go
@@ -24,9 +24,7 @@ import (
 
 	pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/test/e2e/utils"
diff --git a/test/e2e/deployimage/e2e_suite_test.go b/test/e2e/deployimage/e2e_suite_test.go
index c141e10ee48..cff1a3de4e7 100644
--- a/test/e2e/deployimage/e2e_suite_test.go
+++ b/test/e2e/deployimage/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/test/e2e/deployimage/plugin_cluster_test.go b/test/e2e/deployimage/plugin_cluster_test.go
index 6c3e1c5ba18..c831dae5616 100644
--- a/test/e2e/deployimage/plugin_cluster_test.go
+++ b/test/e2e/deployimage/plugin_cluster_test.go
@@ -26,9 +26,7 @@ import (
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/test/e2e/utils"
diff --git a/test/e2e/externalplugin/e2e_suite_test.go b/test/e2e/externalplugin/e2e_suite_test.go
index a20c319f642..5c299900035 100644
--- a/test/e2e/externalplugin/e2e_suite_test.go
+++ b/test/e2e/externalplugin/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/test/e2e/externalplugin/generate_test.go b/test/e2e/externalplugin/generate_test.go
index 51729501683..17bbd66b25b 100644
--- a/test/e2e/externalplugin/generate_test.go
+++ b/test/e2e/externalplugin/generate_test.go
@@ -21,9 +21,7 @@ import (
 
 	pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	//nolint:golint
diff --git a/test/e2e/grafana/e2e_suite_test.go b/test/e2e/grafana/e2e_suite_test.go
index e46efacdb27..c26db06bb01 100644
--- a/test/e2e/grafana/e2e_suite_test.go
+++ b/test/e2e/grafana/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/test/e2e/grafana/generate_test.go b/test/e2e/grafana/generate_test.go
index 22de1e4f2f9..a2b762a221e 100644
--- a/test/e2e/grafana/generate_test.go
+++ b/test/e2e/grafana/generate_test.go
@@ -21,10 +21,8 @@ import (
 
 	pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/test/e2e/utils"
diff --git a/test/e2e/utils/kubectl_test.go b/test/e2e/utils/kubectl_test.go
index f051597bd4e..dde8328da48 100644
--- a/test/e2e/utils/kubectl_test.go
+++ b/test/e2e/utils/kubectl_test.go
@@ -17,9 +17,7 @@ limitations under the License.
 package utils
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/test/e2e/utils/suite_test.go b/test/e2e/utils/suite_test.go
index 71e149df30e..fd80f3ac760 100644
--- a/test/e2e/utils/suite_test.go
+++ b/test/e2e/utils/suite_test.go
@@ -19,9 +19,7 @@ package utils
 import (
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/test/e2e/utils/test_context.go b/test/e2e/utils/test_context.go
index dfebaf84c14..5bea28a3b7d 100644
--- a/test/e2e/utils/test_context.go
+++ b/test/e2e/utils/test_context.go
@@ -27,7 +27,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/test/e2e/v4/e2e_suite_test.go b/test/e2e/v4/e2e_suite_test.go
index 14876eb4ef7..91f0e026361 100644
--- a/test/e2e/v4/e2e_suite_test.go
+++ b/test/e2e/v4/e2e_suite_test.go
@@ -23,9 +23,7 @@ import (
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
 	"sigs.k8s.io/kubebuilder/v3/test/e2e/utils"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/test/e2e/v4/generate_test.go b/test/e2e/v4/generate_test.go
index 8afe83991f7..02f72b01910 100644
--- a/test/e2e/v4/generate_test.go
+++ b/test/e2e/v4/generate_test.go
@@ -21,9 +21,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
diff --git a/test/e2e/v4/plugin_cluster_test.go b/test/e2e/v4/plugin_cluster_test.go
index 266bf7dc210..034266e6741 100644
--- a/test/e2e/v4/plugin_cluster_test.go
+++ b/test/e2e/v4/plugin_cluster_test.go
@@ -28,10 +28,8 @@ import (
 
 	"sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/v3/test/e2e/utils"
diff --git a/testdata/project-v2/controllers/suite_test.go b/testdata/project-v2/controllers/suite_test.go
index 199e44e3dd4..6cfacce548b 100644
--- a/testdata/project-v2/controllers/suite_test.go
+++ b/testdata/project-v2/controllers/suite_test.go
@@ -21,8 +21,6 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v3/api/v1/webhook_suite_test.go b/testdata/project-v3/api/v1/webhook_suite_test.go
index 677d1a7acae..456fa6a823a 100644
--- a/testdata/project-v3/api/v1/webhook_suite_test.go
+++ b/testdata/project-v3/api/v1/webhook_suite_test.go
@@ -25,12 +25,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 
+	admissionv1beta1 "k8s.io/api/admission/v1beta1"
 	//+kubebuilder:scaffold:imports
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v3/controllers/suite_test.go b/testdata/project-v3/controllers/suite_test.go
index 18b53958a60..f9c01d744da 100644
--- a/testdata/project-v3/controllers/suite_test.go
+++ b/testdata/project-v3/controllers/suite_test.go
@@ -20,9 +20,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/api/crew/v1/captain_webhook_test.go b/testdata/project-v4-multigroup-with-deploy-image/api/crew/v1/captain_webhook_test.go
index adb7e762c72..3b286582166 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/api/crew/v1/captain_webhook_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/api/crew/v1/captain_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup-with-deploy-image/api/crew/v1/webhook_suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/api/crew/v1/webhook_suite_test.go
index b99cede6ab8..142ecea890c 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/api/crew/v1/webhook_suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/api/crew/v1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1/destroyer_webhook_test.go b/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1/destroyer_webhook_test.go
index 02de0482cea..d9581869f03 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1/destroyer_webhook_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1/destroyer_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1/webhook_suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1/webhook_suite_test.go
index ed8afbfbc1e..8d5a2293fbf 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1/webhook_suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1beta1/frigate_webhook_test.go b/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1beta1/frigate_webhook_test.go
index 8fdfb4e1cee..2fbb330994a 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1beta1/frigate_webhook_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/api/ship/v1beta1/frigate_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup-with-deploy-image/api/ship/v2alpha1/cruiser_webhook_test.go b/testdata/project-v4-multigroup-with-deploy-image/api/ship/v2alpha1/cruiser_webhook_test.go
index 75d64c87103..7678703b212 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/api/ship/v2alpha1/cruiser_webhook_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/api/ship/v2alpha1/cruiser_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v2alpha1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup-with-deploy-image/api/ship/v2alpha1/webhook_suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/api/ship/v2alpha1/webhook_suite_test.go
index 88029c6c530..1b64559ad50 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/api/ship/v2alpha1/webhook_suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/api/ship/v2alpha1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/api/v1/lakers_webhook_test.go b/testdata/project-v4-multigroup-with-deploy-image/api/v1/lakers_webhook_test.go
index 51203ecb9d1..9f63f052c50 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/api/v1/lakers_webhook_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/api/v1/lakers_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup-with-deploy-image/api/v1/webhook_suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/api/v1/webhook_suite_test.go
index 7fcaa562654..44b0f919c70 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/api/v1/webhook_suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/api/v1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/apps/deployment_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/apps/deployment_controller_test.go
index 612f7582936..339a1532026 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/apps/deployment_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/apps/deployment_controller_test.go
@@ -17,8 +17,6 @@ limitations under the License.
 package apps
 
 import (
-
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/apps/suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/apps/suite_test.go
index 449bd2b59bf..c6217718b62 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/apps/suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/apps/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/crew/captain_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/crew/captain_controller_test.go
index 38e991abe63..b2be385dd91 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/crew/captain_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/crew/captain_controller_test.go
@@ -18,9 +18,8 @@ package crew
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/crew/suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/crew/suite_test.go
index 79e2501c8d8..ca2d88fa291 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/crew/suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/crew/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/fiz/bar_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/fiz/bar_controller_test.go
index 4cb878b6233..2b9c388f1d5 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/fiz/bar_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/fiz/bar_controller_test.go
@@ -18,9 +18,8 @@ package fiz
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/fiz/suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/fiz/suite_test.go
index 8d16317baf2..0df1c12e9fe 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/fiz/suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/fiz/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo.policy/healthcheckpolicy_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo.policy/healthcheckpolicy_controller_test.go
index 2db63d1025d..57b911e8893 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo.policy/healthcheckpolicy_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo.policy/healthcheckpolicy_controller_test.go
@@ -18,9 +18,8 @@ package foopolicy
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo.policy/suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo.policy/suite_test.go
index fb1328da5f6..7c3c5b20fcb 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo.policy/suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo.policy/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo/bar_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo/bar_controller_test.go
index 1a70f09e8f8..c0bd76e8f26 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo/bar_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo/bar_controller_test.go
@@ -18,9 +18,8 @@ package foo
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo/suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo/suite_test.go
index 7ccec701d73..83b9fca5e82 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo/suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/foo/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/lakers_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/lakers_controller_test.go
index ade4b312605..55ddba24b09 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/lakers_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/lakers_controller_test.go
@@ -18,9 +18,8 @@ package controller
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/kraken_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/kraken_controller_test.go
index 31ca7d70067..531252dca2b 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/kraken_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/kraken_controller_test.go
@@ -18,9 +18,8 @@ package seacreatures
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/leviathan_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/leviathan_controller_test.go
index b0741baba9a..9c0a6d79d87 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/leviathan_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/leviathan_controller_test.go
@@ -18,9 +18,8 @@ package seacreatures
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/suite_test.go
index d9cef66eb54..fe2dbcacaf8 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/sea-creatures/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/cruiser_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/cruiser_controller_test.go
index 1cc538c1c83..6c008717e68 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/cruiser_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/cruiser_controller_test.go
@@ -18,9 +18,8 @@ package ship
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/destroyer_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/destroyer_controller_test.go
index ad075d96dbe..fff4e22fc60 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/destroyer_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/destroyer_controller_test.go
@@ -18,9 +18,8 @@ package ship
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/frigate_controller_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/frigate_controller_test.go
index 564b9cd49fd..d8597e00598 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/frigate_controller_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/frigate_controller_test.go
@@ -18,9 +18,8 @@ package ship
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/suite_test.go
index 9bee0731b36..0e8cc038ab7 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/ship/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/suite_test.go
index 4babb27ce91..101c80dbfe5 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/internal/controller/suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/internal/controller/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/test/e2e/e2e_suite_test.go b/testdata/project-v4-multigroup-with-deploy-image/test/e2e/e2e_suite_test.go
index 194bf856a53..d55cd5da70d 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/test/e2e/e2e_suite_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/testdata/project-v4-multigroup-with-deploy-image/test/e2e/e2e_test.go b/testdata/project-v4-multigroup-with-deploy-image/test/e2e/e2e_test.go
index f106f4726e8..619c7651e00 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/test/e2e/e2e_test.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-deploy-image/test/utils"
diff --git a/testdata/project-v4-multigroup-with-deploy-image/test/utils/utils.go b/testdata/project-v4-multigroup-with-deploy-image/test/utils/utils.go
index 6ad98ac1159..31454d2fc4a 100644
--- a/testdata/project-v4-multigroup-with-deploy-image/test/utils/utils.go
+++ b/testdata/project-v4-multigroup-with-deploy-image/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 
diff --git a/testdata/project-v4-multigroup/api/crew/v1/captain_webhook_test.go b/testdata/project-v4-multigroup/api/crew/v1/captain_webhook_test.go
index adb7e762c72..3b286582166 100644
--- a/testdata/project-v4-multigroup/api/crew/v1/captain_webhook_test.go
+++ b/testdata/project-v4-multigroup/api/crew/v1/captain_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup/api/crew/v1/webhook_suite_test.go b/testdata/project-v4-multigroup/api/crew/v1/webhook_suite_test.go
index b99cede6ab8..142ecea890c 100644
--- a/testdata/project-v4-multigroup/api/crew/v1/webhook_suite_test.go
+++ b/testdata/project-v4-multigroup/api/crew/v1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v4-multigroup/api/ship/v1/destroyer_webhook_test.go b/testdata/project-v4-multigroup/api/ship/v1/destroyer_webhook_test.go
index 02de0482cea..d9581869f03 100644
--- a/testdata/project-v4-multigroup/api/ship/v1/destroyer_webhook_test.go
+++ b/testdata/project-v4-multigroup/api/ship/v1/destroyer_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup/api/ship/v1/webhook_suite_test.go b/testdata/project-v4-multigroup/api/ship/v1/webhook_suite_test.go
index ed8afbfbc1e..8d5a2293fbf 100644
--- a/testdata/project-v4-multigroup/api/ship/v1/webhook_suite_test.go
+++ b/testdata/project-v4-multigroup/api/ship/v1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v4-multigroup/api/ship/v1beta1/frigate_webhook_test.go b/testdata/project-v4-multigroup/api/ship/v1beta1/frigate_webhook_test.go
index 8fdfb4e1cee..2fbb330994a 100644
--- a/testdata/project-v4-multigroup/api/ship/v1beta1/frigate_webhook_test.go
+++ b/testdata/project-v4-multigroup/api/ship/v1beta1/frigate_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup/api/ship/v2alpha1/cruiser_webhook_test.go b/testdata/project-v4-multigroup/api/ship/v2alpha1/cruiser_webhook_test.go
index 75d64c87103..7678703b212 100644
--- a/testdata/project-v4-multigroup/api/ship/v2alpha1/cruiser_webhook_test.go
+++ b/testdata/project-v4-multigroup/api/ship/v2alpha1/cruiser_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v2alpha1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup/api/ship/v2alpha1/webhook_suite_test.go b/testdata/project-v4-multigroup/api/ship/v2alpha1/webhook_suite_test.go
index 88029c6c530..1b64559ad50 100644
--- a/testdata/project-v4-multigroup/api/ship/v2alpha1/webhook_suite_test.go
+++ b/testdata/project-v4-multigroup/api/ship/v2alpha1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v4-multigroup/api/v1/lakers_webhook_test.go b/testdata/project-v4-multigroup/api/v1/lakers_webhook_test.go
index 51203ecb9d1..9f63f052c50 100644
--- a/testdata/project-v4-multigroup/api/v1/lakers_webhook_test.go
+++ b/testdata/project-v4-multigroup/api/v1/lakers_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup/api/v1/webhook_suite_test.go b/testdata/project-v4-multigroup/api/v1/webhook_suite_test.go
index 7fcaa562654..44b0f919c70 100644
--- a/testdata/project-v4-multigroup/api/v1/webhook_suite_test.go
+++ b/testdata/project-v4-multigroup/api/v1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v4-multigroup/internal/controller/apps/deployment_controller_test.go b/testdata/project-v4-multigroup/internal/controller/apps/deployment_controller_test.go
index 612f7582936..339a1532026 100644
--- a/testdata/project-v4-multigroup/internal/controller/apps/deployment_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/apps/deployment_controller_test.go
@@ -17,8 +17,6 @@ limitations under the License.
 package apps
 
 import (
-
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-multigroup/internal/controller/apps/suite_test.go b/testdata/project-v4-multigroup/internal/controller/apps/suite_test.go
index 449bd2b59bf..c6217718b62 100644
--- a/testdata/project-v4-multigroup/internal/controller/apps/suite_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/apps/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/testdata/project-v4-multigroup/internal/controller/crew/captain_controller_test.go b/testdata/project-v4-multigroup/internal/controller/crew/captain_controller_test.go
index f87f7246ac2..c2495aee47c 100644
--- a/testdata/project-v4-multigroup/internal/controller/crew/captain_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/crew/captain_controller_test.go
@@ -18,9 +18,8 @@ package crew
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup/internal/controller/crew/suite_test.go b/testdata/project-v4-multigroup/internal/controller/crew/suite_test.go
index c47ec44c72d..7d89a96d792 100644
--- a/testdata/project-v4-multigroup/internal/controller/crew/suite_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/crew/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup/internal/controller/fiz/bar_controller_test.go b/testdata/project-v4-multigroup/internal/controller/fiz/bar_controller_test.go
index 040477d357f..c9dca3f1172 100644
--- a/testdata/project-v4-multigroup/internal/controller/fiz/bar_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/fiz/bar_controller_test.go
@@ -18,9 +18,8 @@ package fiz
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup/internal/controller/fiz/suite_test.go b/testdata/project-v4-multigroup/internal/controller/fiz/suite_test.go
index 7e79654a9a7..9cb51549582 100644
--- a/testdata/project-v4-multigroup/internal/controller/fiz/suite_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/fiz/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup/internal/controller/foo.policy/healthcheckpolicy_controller_test.go b/testdata/project-v4-multigroup/internal/controller/foo.policy/healthcheckpolicy_controller_test.go
index 8c4e2c008e5..55de998a0a2 100644
--- a/testdata/project-v4-multigroup/internal/controller/foo.policy/healthcheckpolicy_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/foo.policy/healthcheckpolicy_controller_test.go
@@ -18,9 +18,8 @@ package foopolicy
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup/internal/controller/foo.policy/suite_test.go b/testdata/project-v4-multigroup/internal/controller/foo.policy/suite_test.go
index 6f739f9bd94..82a1445c2dc 100644
--- a/testdata/project-v4-multigroup/internal/controller/foo.policy/suite_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/foo.policy/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup/internal/controller/foo/bar_controller_test.go b/testdata/project-v4-multigroup/internal/controller/foo/bar_controller_test.go
index 8bbb716dd8d..12193854c79 100644
--- a/testdata/project-v4-multigroup/internal/controller/foo/bar_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/foo/bar_controller_test.go
@@ -18,9 +18,8 @@ package foo
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup/internal/controller/foo/suite_test.go b/testdata/project-v4-multigroup/internal/controller/foo/suite_test.go
index 5146bcdfddf..0fe34ceec85 100644
--- a/testdata/project-v4-multigroup/internal/controller/foo/suite_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/foo/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup/internal/controller/lakers_controller_test.go b/testdata/project-v4-multigroup/internal/controller/lakers_controller_test.go
index 6d26f075185..84ae3e086e0 100644
--- a/testdata/project-v4-multigroup/internal/controller/lakers_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/lakers_controller_test.go
@@ -18,9 +18,8 @@ package controller
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup/internal/controller/sea-creatures/kraken_controller_test.go b/testdata/project-v4-multigroup/internal/controller/sea-creatures/kraken_controller_test.go
index 22f4f21ff6f..b0eae061ff8 100644
--- a/testdata/project-v4-multigroup/internal/controller/sea-creatures/kraken_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/sea-creatures/kraken_controller_test.go
@@ -18,9 +18,8 @@ package seacreatures
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup/internal/controller/sea-creatures/leviathan_controller_test.go b/testdata/project-v4-multigroup/internal/controller/sea-creatures/leviathan_controller_test.go
index 47f58648f18..5b1e491aa89 100644
--- a/testdata/project-v4-multigroup/internal/controller/sea-creatures/leviathan_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/sea-creatures/leviathan_controller_test.go
@@ -18,9 +18,8 @@ package seacreatures
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup/internal/controller/sea-creatures/suite_test.go b/testdata/project-v4-multigroup/internal/controller/sea-creatures/suite_test.go
index 4dc3da6bc0f..8e68c34098f 100644
--- a/testdata/project-v4-multigroup/internal/controller/sea-creatures/suite_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/sea-creatures/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup/internal/controller/ship/cruiser_controller_test.go b/testdata/project-v4-multigroup/internal/controller/ship/cruiser_controller_test.go
index 30147dfe3a3..5d432ab735e 100644
--- a/testdata/project-v4-multigroup/internal/controller/ship/cruiser_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/ship/cruiser_controller_test.go
@@ -18,9 +18,8 @@ package ship
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup/internal/controller/ship/destroyer_controller_test.go b/testdata/project-v4-multigroup/internal/controller/ship/destroyer_controller_test.go
index 742b2569d8d..c1de1afb8b6 100644
--- a/testdata/project-v4-multigroup/internal/controller/ship/destroyer_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/ship/destroyer_controller_test.go
@@ -18,9 +18,8 @@ package ship
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup/internal/controller/ship/frigate_controller_test.go b/testdata/project-v4-multigroup/internal/controller/ship/frigate_controller_test.go
index d26cb67be7f..f36a8679754 100644
--- a/testdata/project-v4-multigroup/internal/controller/ship/frigate_controller_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/ship/frigate_controller_test.go
@@ -18,9 +18,8 @@ package ship
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4-multigroup/internal/controller/ship/suite_test.go b/testdata/project-v4-multigroup/internal/controller/ship/suite_test.go
index 95d12bcacfa..c2a7ac1128c 100644
--- a/testdata/project-v4-multigroup/internal/controller/ship/suite_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/ship/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup/internal/controller/suite_test.go b/testdata/project-v4-multigroup/internal/controller/suite_test.go
index 06306851d77..04793a59cff 100644
--- a/testdata/project-v4-multigroup/internal/controller/suite_test.go
+++ b/testdata/project-v4-multigroup/internal/controller/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-multigroup/test/e2e/e2e_suite_test.go b/testdata/project-v4-multigroup/test/e2e/e2e_suite_test.go
index bcb143152c2..a29453d76cd 100644
--- a/testdata/project-v4-multigroup/test/e2e/e2e_suite_test.go
+++ b/testdata/project-v4-multigroup/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/testdata/project-v4-multigroup/test/e2e/e2e_test.go b/testdata/project-v4-multigroup/test/e2e/e2e_test.go
index 678605dd4ed..3f427fde7b4 100644
--- a/testdata/project-v4-multigroup/test/e2e/e2e_test.go
+++ b/testdata/project-v4-multigroup/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/test/utils"
diff --git a/testdata/project-v4-multigroup/test/utils/utils.go b/testdata/project-v4-multigroup/test/utils/utils.go
index 6ad98ac1159..31454d2fc4a 100644
--- a/testdata/project-v4-multigroup/test/utils/utils.go
+++ b/testdata/project-v4-multigroup/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 
diff --git a/testdata/project-v4-with-deploy-image/api/v1alpha1/memcached_webhook_test.go b/testdata/project-v4-with-deploy-image/api/v1alpha1/memcached_webhook_test.go
index f6ec32a1a3d..39c2ed23133 100644
--- a/testdata/project-v4-with-deploy-image/api/v1alpha1/memcached_webhook_test.go
+++ b/testdata/project-v4-with-deploy-image/api/v1alpha1/memcached_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1alpha1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4-with-deploy-image/api/v1alpha1/webhook_suite_test.go b/testdata/project-v4-with-deploy-image/api/v1alpha1/webhook_suite_test.go
index d4149f958cb..16e8c41d338 100644
--- a/testdata/project-v4-with-deploy-image/api/v1alpha1/webhook_suite_test.go
+++ b/testdata/project-v4-with-deploy-image/api/v1alpha1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v4-with-deploy-image/internal/controller/busybox_controller_test.go b/testdata/project-v4-with-deploy-image/internal/controller/busybox_controller_test.go
index 45fe8eab917..f9b5d5ace5c 100644
--- a/testdata/project-v4-with-deploy-image/internal/controller/busybox_controller_test.go
+++ b/testdata/project-v4-with-deploy-image/internal/controller/busybox_controller_test.go
@@ -23,9 +23,7 @@ import (
 	"time"
 
 	//nolint:golint
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/testdata/project-v4-with-deploy-image/internal/controller/memcached_controller_test.go b/testdata/project-v4-with-deploy-image/internal/controller/memcached_controller_test.go
index d4845f4b9ca..76966e7344f 100644
--- a/testdata/project-v4-with-deploy-image/internal/controller/memcached_controller_test.go
+++ b/testdata/project-v4-with-deploy-image/internal/controller/memcached_controller_test.go
@@ -23,9 +23,7 @@ import (
 	"time"
 
 	//nolint:golint
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/testdata/project-v4-with-deploy-image/internal/controller/suite_test.go b/testdata/project-v4-with-deploy-image/internal/controller/suite_test.go
index 63ae03d9ac0..60e7fe03756 100644
--- a/testdata/project-v4-with-deploy-image/internal/controller/suite_test.go
+++ b/testdata/project-v4-with-deploy-image/internal/controller/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4-with-deploy-image/test/e2e/e2e_suite_test.go b/testdata/project-v4-with-deploy-image/test/e2e/e2e_suite_test.go
index f36e2b7d1d6..8dab261170b 100644
--- a/testdata/project-v4-with-deploy-image/test/e2e/e2e_suite_test.go
+++ b/testdata/project-v4-with-deploy-image/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/testdata/project-v4-with-deploy-image/test/e2e/e2e_test.go b/testdata/project-v4-with-deploy-image/test/e2e/e2e_test.go
index 9e46baf14cd..8e53b230045 100644
--- a/testdata/project-v4-with-deploy-image/test/e2e/e2e_test.go
+++ b/testdata/project-v4-with-deploy-image/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/testdata/project-v4-with-deploy-image/test/utils"
diff --git a/testdata/project-v4-with-deploy-image/test/utils/utils.go b/testdata/project-v4-with-deploy-image/test/utils/utils.go
index 6ad98ac1159..31454d2fc4a 100644
--- a/testdata/project-v4-with-deploy-image/test/utils/utils.go
+++ b/testdata/project-v4-with-deploy-image/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 
diff --git a/testdata/project-v4-with-grafana/test/e2e/e2e_suite_test.go b/testdata/project-v4-with-grafana/test/e2e/e2e_suite_test.go
index a7adc5a4362..f3f265474a5 100644
--- a/testdata/project-v4-with-grafana/test/e2e/e2e_suite_test.go
+++ b/testdata/project-v4-with-grafana/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/testdata/project-v4-with-grafana/test/e2e/e2e_test.go b/testdata/project-v4-with-grafana/test/e2e/e2e_test.go
index 39f1649287e..18448c90e19 100644
--- a/testdata/project-v4-with-grafana/test/e2e/e2e_test.go
+++ b/testdata/project-v4-with-grafana/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/testdata/project-v4-with-grafana/test/utils"
diff --git a/testdata/project-v4-with-grafana/test/utils/utils.go b/testdata/project-v4-with-grafana/test/utils/utils.go
index 6ad98ac1159..31454d2fc4a 100644
--- a/testdata/project-v4-with-grafana/test/utils/utils.go
+++ b/testdata/project-v4-with-grafana/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )
 
diff --git a/testdata/project-v4/api/v1/admiral_webhook_test.go b/testdata/project-v4/api/v1/admiral_webhook_test.go
index 5deb59ba5df..a93b75f5b66 100644
--- a/testdata/project-v4/api/v1/admiral_webhook_test.go
+++ b/testdata/project-v4/api/v1/admiral_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4/api/v1/captain_webhook_test.go b/testdata/project-v4/api/v1/captain_webhook_test.go
index adb7e762c72..3b286582166 100644
--- a/testdata/project-v4/api/v1/captain_webhook_test.go
+++ b/testdata/project-v4/api/v1/captain_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4/api/v1/firstmate_webhook_test.go b/testdata/project-v4/api/v1/firstmate_webhook_test.go
index 488d12a2989..59e92841cc1 100644
--- a/testdata/project-v4/api/v1/firstmate_webhook_test.go
+++ b/testdata/project-v4/api/v1/firstmate_webhook_test.go
@@ -17,7 +17,6 @@ limitations under the License.
 package v1
 
 import (
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4/api/v1/webhook_suite_test.go b/testdata/project-v4/api/v1/webhook_suite_test.go
index 344da4fc5d8..4d2a0cbe6ec 100644
--- a/testdata/project-v4/api/v1/webhook_suite_test.go
+++ b/testdata/project-v4/api/v1/webhook_suite_test.go
@@ -26,12 +26,10 @@ import (
 	"testing"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
-	admissionv1 "k8s.io/api/admission/v1"
 
+	admissionv1 "k8s.io/api/admission/v1"
 	//+kubebuilder:scaffold:imports
 	apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
diff --git a/testdata/project-v4/internal/controller/admiral_controller_test.go b/testdata/project-v4/internal/controller/admiral_controller_test.go
index ca9927f90e6..c807fe051f9 100644
--- a/testdata/project-v4/internal/controller/admiral_controller_test.go
+++ b/testdata/project-v4/internal/controller/admiral_controller_test.go
@@ -18,9 +18,8 @@ package controller
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4/internal/controller/captain_controller_test.go b/testdata/project-v4/internal/controller/captain_controller_test.go
index 5da933c6bbf..6c03fbf272e 100644
--- a/testdata/project-v4/internal/controller/captain_controller_test.go
+++ b/testdata/project-v4/internal/controller/captain_controller_test.go
@@ -18,9 +18,8 @@ package controller
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4/internal/controller/firstmate_controller_test.go b/testdata/project-v4/internal/controller/firstmate_controller_test.go
index 9aea8da5e8b..e5bc9666411 100644
--- a/testdata/project-v4/internal/controller/firstmate_controller_test.go
+++ b/testdata/project-v4/internal/controller/firstmate_controller_test.go
@@ -18,9 +18,8 @@ package controller
 
 import (
 	"context"
-	// nolint:revive
+
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/testdata/project-v4/internal/controller/laker_controller_test.go b/testdata/project-v4/internal/controller/laker_controller_test.go
index 591d7f287d3..dad17ef9eb5 100644
--- a/testdata/project-v4/internal/controller/laker_controller_test.go
+++ b/testdata/project-v4/internal/controller/laker_controller_test.go
@@ -17,8 +17,6 @@ limitations under the License.
 package controller
 
 import (
-
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
 )
 
diff --git a/testdata/project-v4/internal/controller/suite_test.go b/testdata/project-v4/internal/controller/suite_test.go
index 002bd7f254f..59fbfbe101d 100644
--- a/testdata/project-v4/internal/controller/suite_test.go
+++ b/testdata/project-v4/internal/controller/suite_test.go
@@ -22,9 +22,7 @@ import (
 	"runtime"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"k8s.io/client-go/kubernetes/scheme"
diff --git a/testdata/project-v4/test/e2e/e2e_suite_test.go b/testdata/project-v4/test/e2e/e2e_suite_test.go
index 9685a4aa7c5..e639b2ff564 100644
--- a/testdata/project-v4/test/e2e/e2e_suite_test.go
+++ b/testdata/project-v4/test/e2e/e2e_suite_test.go
@@ -20,9 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 )
 
diff --git a/testdata/project-v4/test/e2e/e2e_test.go b/testdata/project-v4/test/e2e/e2e_test.go
index 1556c305242..5dfdb827a21 100644
--- a/testdata/project-v4/test/e2e/e2e_test.go
+++ b/testdata/project-v4/test/e2e/e2e_test.go
@@ -21,9 +21,7 @@ import (
 	"os/exec"
 	"time"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2"
-	// nolint:revive
 	. "github.com/onsi/gomega"
 
 	"sigs.k8s.io/kubebuilder/testdata/project-v4/test/utils"
diff --git a/testdata/project-v4/test/utils/utils.go b/testdata/project-v4/test/utils/utils.go
index 6ad98ac1159..31454d2fc4a 100644
--- a/testdata/project-v4/test/utils/utils.go
+++ b/testdata/project-v4/test/utils/utils.go
@@ -22,7 +22,6 @@ import (
 	"os/exec"
 	"strings"
 
-	// nolint:revive
 	. "github.com/onsi/ginkgo/v2" //nolint:golint,revive
 )