Merge pull request #1120 from Adirio/cleanup

✨ Cleanup scaffolding

Author: k8s-ci-robot

pkg/scaffold/v2/controller.go

@@ -71,10 +71,10 @@ package controllers
 import (
 	"context"
 
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/runtime"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	{{ .Resource.GroupImportSafe }}{{ .Resource.Version }} "{{ .ResourcePackage }}/{{ .Resource.Version }}"
 )

pkg/scaffold/v2/controller_suitetest.go

@@ -112,7 +112,6 @@ var _ = BeforeSuite(func(done Done) {
 
 	// +kubebuilder:scaffold:scheme
 
-
 	k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
 	Expect(err).ToNot(HaveOccurred())
 	Expect(k8sClient).ToNot(BeNil())

pkg/scaffold/v2/group.go

@@ -55,9 +55,8 @@ var groupTemplate = `{{ .Boilerplate }}
 package {{ .Resource.Version }}
 
 import (
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
 )
 
 var (

pkg/scaffold/v2/main.go

@@ -63,13 +63,13 @@ func (m *Main) Update(opts *MainUpdateOptions) error {
 	addschemeCodeFragment := fmt.Sprintf(`_ = %s%s.AddToScheme(scheme)
 `, opts.Resource.GroupImportSafe, opts.Resource.Version)
 	reconcilerSetupCodeFragment := fmt.Sprintf(`if err = (&controllers.%sReconciler{
-	 	Client: mgr.GetClient(),
-        Log: ctrl.Log.WithName("controllers").WithName("%s"),
-        Scheme: mgr.GetScheme(),  
+		Client: mgr.GetClient(),
+		Log: ctrl.Log.WithName("controllers").WithName("%s"),
+		Scheme: mgr.GetScheme(),  
 	}).SetupWithManager(mgr); err != nil {
-	 	setupLog.Error(err, "unable to create controller", "controller", "%s")
-	 	os.Exit(1)
-    }
+		setupLog.Error(err, "unable to create controller", "controller", "%s")
+		os.Exit(1)
+	}
 `, opts.Resource.Kind, opts.Resource.Kind, opts.Resource.Kind)
 	webhookSetupCodeFragment := fmt.Sprintf(`if err = (&%s%s.%s{}).SetupWebhookWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create webhook", "webhook", "%s")
@@ -130,14 +130,13 @@ package main
 
 import (
 	"flag"
-    "os"
+	"os"
 
+	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
-    ctrl "sigs.k8s.io/controller-runtime"
-    "sigs.k8s.io/controller-runtime/pkg/log/zap"
-    "k8s.io/apimachinery/pkg/runtime"
-
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	%s
 )
@@ -176,7 +175,6 @@ func main() {
 		os.Exit(1)
 	}
 
-
 	%s
 
 	setupLog.Info("starting manager")