Merge pull request #275 from honza/release-4.13-log-format

OCPBUGS-12363: release-4.13: Use same settings for provisioner and controller logs

main.go

@@ -117,15 +117,14 @@ func main() {
 	// NOTE (honza): Downstream only: disabling webhooks until CBO supports them
 	flag.IntVar(&webhookPort, "webhook-port", 0,
 		"Webhook Server port (set to 0 to disable)")
-	opts := zap.Options{
-		Development: devLogging,
-		TimeEncoder: zapcore.ISO8601TimeEncoder,
-	}
-	opts.BindFlags(flag.CommandLine)
-
 	flag.Parse()
 
-	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
+	logOpts := zap.Options{}
+	if devLogging {
+		logOpts.Development = true
+		logOpts.TimeEncoder = zapcore.ISO8601TimeEncoder
+	}
+	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&logOpts)))
 
 	printVersion()
 
@@ -163,7 +162,8 @@ func main() {
 		ctrl.Log.Info("using demo provisioner")
 		provisionerFactory = &demo.Demo{}
 	} else {
-		provisionerFactory = ironic.NewProvisionerFactory(preprovImgEnable)
+		provLog := zap.New(zap.UseFlagOptions(&logOpts)).WithName("provisioner")
+		provisionerFactory = ironic.NewProvisionerFactory(provLog, preprovImgEnable)
 	}
 
 	if err = (&metal3iocontroller.BareMetalHostReconciler{

pkg/provisioner/ironic/factory.go

@@ -10,9 +10,6 @@ import (
 
 	"github.com/go-logr/logr"
 	"github.com/gophercloud/gophercloud"
-	"go.uber.org/zap/zapcore"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	logz "sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	"github.com/metal3-io/baremetal-operator/pkg/provisioner"
 	"github.com/metal3-io/baremetal-operator/pkg/provisioner/ironic/clients"
@@ -29,14 +26,10 @@ type ironicProvisionerFactory struct {
 	clientInspector *gophercloud.ServiceClient
 }
 
-func NewProvisionerFactory(havePreprovImgBuilder bool) provisioner.Factory {
-	factory := ironicProvisionerFactory{}
-
-	opts := zap.Options{
-		Development: true,
-		TimeEncoder: zapcore.ISO8601TimeEncoder,
+func NewProvisionerFactory(logger logr.Logger, havePreprovImgBuilder bool) provisioner.Factory {
+	factory := ironicProvisionerFactory{
+		log: logger.WithName("ironic"),
 	}
-	factory.log = logz.New(zap.UseFlagOptions(&opts)).WithName("provisioner").WithName("ironic")
 
 	err := factory.init(havePreprovImgBuilder)
 	if err != nil {