Merge branch 'master' into feature/actions-for-secret-syncing

pkg/controller/controller.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"k8s.io/api/core/v1"
 	rbacv1beta1 "k8s.io/api/rbac/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -157,10 +157,10 @@ func (c *Controller) initPodServiceAccount() {
 
 	if c.opConfig.PodServiceAccountDefinition == "" {
 		c.opConfig.PodServiceAccountDefinition = `
-		{ "apiVersion": "v1", 
-		  "kind": "ServiceAccount", 
-		  "metadata": { 
-				 "name": "operator" 
+		{ "apiVersion": "v1",
+		  "kind": "ServiceAccount",
+		  "metadata": {
+				 "name": "operator"
 		   }
 		}`
 	}
@@ -193,10 +193,10 @@ func (c *Controller) initRoleBinding() {
 	// we assume the role is created by the k8s administrator
 	if c.opConfig.PodServiceAccountRoleBindingDefinition == "" {
 		c.opConfig.PodServiceAccountRoleBindingDefinition = `
-		{ 
+		{
 			"apiVersion": "rbac.authorization.k8s.io/v1beta1",
-			"kind": "RoleBinding", 
-			"metadata": { 
+			"kind": "RoleBinding",
+			"metadata": {
 				   "name": "zalando-postgres-operator"
 			},
 			"roleRef": {
@@ -209,7 +209,7 @@ func (c *Controller) initRoleBinding() {
 					"kind": "ServiceAccount",
 					"name": "operator"
 				}
-			]	
+			]
 		}`
 	}
 	c.logger.Info("Parse role bindings")

pkg/controller/logs_and_api.go

@@ -5,7 +5,7 @@ import (
 	"sort"
 	"sync/atomic"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 
 	"github.com/zalando-incubator/postgres-operator/pkg/cluster"
 	"github.com/zalando-incubator/postgres-operator/pkg/spec"

pkg/controller/postgresql.go

@@ -8,7 +8,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -71,7 +71,7 @@ func (c *Controller) clusterListAndSync() error {
 		}
 		c.queueEvents(list, event)
 	} else {
-		c.logger.Infof("not enough time passed since the last sync (%s seconds) or repair (%s seconds)",
+		c.logger.Infof("not enough time passed since the last sync (%v seconds) or repair (%v seconds)",
 			timeFromPreviousSync, timeFromPreviousRepair)
 	}
 	return nil