From d3359f79cfac1f2975ad2b0524154b8dceef5887 Mon Sep 17 00:00:00 2001
From: Ewout Prangsma <ewout@prangsma.net>
Date: Fri, 9 Feb 2018 15:46:14 +0100
Subject: [PATCH] Various fixes

---
 Makefile                 | 4 ++++
 examples/deployment.yaml | 1 +
 main.go                  | 2 +-
 pkg/logging/logger.go    | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 417434409..f45d47219 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,10 @@ SOURCES := $(shell find $(SRCDIR) -name '*.go' -not -path './test/*')
 
 all: verify-generated docker
 
+#
+# Tip: Run `eval $(minikube docker-env)` before calling make if you're developing on minikube.
+#
+
 build: docker
 
 clean:
diff --git a/examples/deployment.yaml b/examples/deployment.yaml
index cbf22c22d..1de615523 100644
--- a/examples/deployment.yaml
+++ b/examples/deployment.yaml
@@ -11,6 +11,7 @@ spec:
     spec:
       containers:
       - name: arangodb-operator
+        imagePullPolicy: IfNotPresent
         image: arangodb/arangodb-operator:latest
         env:
         - name: MY_POD_NAMESPACE
diff --git a/main.go b/main.go
index 41687fffe..cfc82b79b 100644
--- a/main.go
+++ b/main.go
@@ -121,7 +121,7 @@ func cmdMainRun(cmd *cobra.Command, args []string) {
 
 	rl, err := resourcelock.New(resourcelock.EndpointsResourceLock,
 		namespace,
-		"arangodb_operator",
+		"arangodb-operator",
 		kubecli.CoreV1(),
 		resourcelock.ResourceLockConfig{
 			Identity:      id,
diff --git a/pkg/logging/logger.go b/pkg/logging/logger.go
index b0c3186b2..2932f0cd9 100644
--- a/pkg/logging/logger.go
+++ b/pkg/logging/logger.go
@@ -58,7 +58,7 @@ type loggingService struct {
 
 // NewRootLogger creates a new zerolog logger with default settings.
 func NewRootLogger() zerolog.Logger {
-	return zerolog.New(os.Stdout).With().Timestamp().Logger()
+	return zerolog.New(zerolog.ConsoleWriter{Out: os.Stdout}).With().Timestamp().Logger()
 }
 
 // NewService creates a new Service.