Fix lint

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

test/test-operator/v1.0.0/cmd/main.go

@@ -21,16 +21,15 @@ import (
 	"flag"
 	"os"
 	"path/filepath"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
-
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-	// to ensure that exec-entrypoint and run can make use of them.
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
+	// to ensure that exec-entrypoint and run can make use of them.
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/certwatcher"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -40,7 +39,6 @@ import (
 
 	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
 	"github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/internal/controller"
-	// +kubebuilder:scaffold:imports
 )
 
 var (

test/test-operator/v1.0.0/internal/controller/suite_test.go

@@ -33,7 +33,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
-	// +kubebuilder:scaffold:imports
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to

test/test-operator/v1.0.0/internal/controller/testoperator_controller.go

@@ -21,11 +21,10 @@ import (
 	"fmt"
 
 	"k8s.io/apimachinery/pkg/api/equality"
-	crfinalizer "sigs.k8s.io/controller-runtime/pkg/finalizer"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	crfinalizer "sigs.k8s.io/controller-runtime/pkg/finalizer"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"

test/test-operator/v1.0.0/internal/controller/testoperator_controller_test.go

@@ -19,16 +19,15 @@ package controller
 import (
 	"context"
 
-	crfinalizer "sigs.k8s.io/controller-runtime/pkg/finalizer"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	crfinalizer "sigs.k8s.io/controller-runtime/pkg/finalizer"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
 )
 

test/test-operator/v2.0.0/cmd/main.go

@@ -21,16 +21,15 @@ import (
 	"flag"
 	"os"
 	"path/filepath"
-	"sigs.k8s.io/controller-runtime/pkg/cache"
-
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-	// to ensure that exec-entrypoint and run can make use of them.
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
+	// to ensure that exec-entrypoint and run can make use of them.
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/certwatcher"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -42,7 +41,6 @@ import (
 	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
 	"github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/internal/controller"
 	testolmwebhook "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/internal/webhook"
-	// +kubebuilder:scaffold:imports
 )
 
 var (

test/test-operator/v2.0.0/internal/controller/suite_test.go

@@ -18,8 +18,6 @@ package controller
 
 import (
 	"context"
-	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
-	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
 	"os"
 	"path/filepath"
 	"testing"
@@ -33,7 +31,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	// +kubebuilder:scaffold:imports
+
+	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
+	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to

test/test-operator/v2.0.0/internal/controller/testoperator_controller.go

@@ -20,16 +20,15 @@ import (
 	"context"
 	"fmt"
 
-	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
-	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
-
 	"k8s.io/apimachinery/pkg/api/equality"
-	crfinalizer "sigs.k8s.io/controller-runtime/pkg/finalizer"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	crfinalizer "sigs.k8s.io/controller-runtime/pkg/finalizer"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	testolmv1 "github.com/operator-framework/operator-controller/test/test-operator/v1.0.0/api/v1"
+	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
 )
 
 const (

test/test-operator/v2.0.0/internal/controller/testoperator_controller_test.go

@@ -18,16 +18,16 @@ package controller
 
 import (
 	"context"
-	crfinalizer "sigs.k8s.io/controller-runtime/pkg/finalizer"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
+	crfinalizer "sigs.k8s.io/controller-runtime/pkg/finalizer"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
 )
 

test/test-operator/v2.0.0/internal/webhook/testoperator_webhook.go

@@ -19,12 +19,12 @@ package webhook
 import (
 	"context"
 	"fmt"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/util/validation/field"
 	"strings"
 
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/util/validation/field"
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"

test/test-operator/v2.0.0/internal/webhook/webhook_suite_test.go

@@ -40,7 +40,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	testolmv2 "github.com/operator-framework/operator-controller/test/test-operator/v2.0.0/api/v2"
-	// +kubebuilder:scaffold:imports
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -124,6 +123,7 @@ var _ = BeforeSuite(func() {
 	dialer := &net.Dialer{Timeout: time.Second}
 	addrPort := fmt.Sprintf("%s:%d", webhookInstallOptions.LocalServingHost, webhookInstallOptions.LocalServingPort)
 	Eventually(func() error {
+		// nolint:gosec
 		conn, err := tls.DialWithDialer(dialer, "tcp", addrPort, &tls.Config{InsecureSkipVerify: true})
 		if err != nil {
 			return err