Bump operator-sdk to v0.2.0

pkg/log/log.go

@@ -1,18 +1,13 @@
 package log
 
-// FIXME delete after bump to v0.2.0 version
-
 import (
-	"log"
-
 	"github.com/go-logr/logr"
-	"github.com/go-logr/zapr"
-	"go.uber.org/zap"
-	runtimelog "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	"sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
 )
 
 // Log represents global logger
-var Log logr.Logger
+var Log logr.Logger = log.Log.WithName("controller-jenkins")
 
 const (
 	// VWarn defines warning log level
@@ -23,21 +18,6 @@ const (
 
 // SetupLogger setups global logger
 func SetupLogger(development *bool) {
-	var zapLog *zap.Logger
-	var err error
-
-	if *development {
-		zapLogCfg := zap.NewDevelopmentConfig()
-		zapLog, err = zapLogCfg.Build(zap.AddCallerSkip(1))
-	} else {
-		zapLogCfg := zap.NewProductionConfig()
-		zapLog, err = zapLogCfg.Build(zap.AddCallerSkip(1))
-	}
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	Log = zapr.NewLogger(zapLog).WithName("jenkins-operator")
-	// Enable logging in controller-runtime, without this you won't get logs when reconcile loop return an error
-	runtimelog.SetLogger(Log)
+	logf.SetLogger(logf.ZapLogger(*development))
+	Log = log.Log.WithName("controller-jenkins")
 }