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

docs/reference/operator_parameters.md

@@ -45,6 +45,8 @@ They will be deprecated and removed in the future.
 
 Variable names are underscore-separated words.
 
+
+
 ## General
 
 Those are top-level keys, containing both leaf keys and groups.
@@ -420,3 +422,5 @@ scalyr sidecar. In the CRD-based configuration they are grouped under the
 * **scalyr_memory_limit**
   Memory limit value for the Scalyr sidecar. The default is `1Gi`.
 
+
+For the configmap operator configuration, the [default parameter values](https://github.com/zalando-incubator/postgres-operator/blob/master/pkg/util/config/config.go#L14) mentioned here are likely to be overwritten in your local operator installation via your local version of the operator configmap. In the case you use the operator CRD, all the CRD defaults are provided in the [operator's default configuration manifest](https://github.com/zalando-incubator/postgres-operator/blob/master/manifests/postgresql-operator-default-configuration.yaml)

glide.lock

@@ -100,7 +100,7 @@ imports:
   version: b2aad2c9a95d14eb978f29baa6e3a5c3c20eef30
 - name: github.com/peterbourgon/diskv
   version: 5f041e8faa004a95c88a202771f4cc3e991971e6
-- name: github.com/Sirupsen/logrus
+- name: github.com/sirupsen/logrus
   version: 3e01752db0189b9157070a0e1668a620f9a85da2
 - name: github.com/spf13/pflag
   version: 583c0c0531f06d5278b7d917446061adc344b5cd

glide.yaml

@@ -1,6 +1,6 @@
 package: github.com/zalando-incubator/postgres-operator
 import:
-- package: github.com/Sirupsen/logrus
+- package: github.com/sirupsen/logrus
   version: ^1.0.1
 - package: github.com/aws/aws-sdk-go
   version: ^1.8.24

pkg/apis/acid.zalan.do/v1/util_test.go

@@ -129,13 +129,8 @@ var unmarshalCluster = []struct {
 			Name: "acid-testcluster1",
 		},
 		Status: ClusterStatusInvalid,
-		Error: (&json.UnmarshalTypeError{
+		// This error message can vary between Go versions, so compute it for the current version.
-			Value:  "number",
+		Error: json.Unmarshal([]byte(`{"teamId": 0}`), &PostgresSpec{}).Error(),
-			Type:   reflect.TypeOf(""),
-			Offset: 126,
-			Struct: "PostgresSpec",
-			Field:  "teamId",
-		}).Error(),
 	},
 	[]byte(`{"kind":"Postgresql","apiVersion":"acid.zalan.do/v1","metadata":{"name":"acid-testcluster1","creationTimestamp":null},"spec":{"postgresql":{"version":"","parameters":null},"volume":{"size":"","storageClass":""},"patroni":{"initdb":null,"pg_hba":null,"ttl":0,"loop_wait":0,"retry_timeout":0,"maximum_lag_on_failover":0},"resources":{"requests":{"cpu":"","memory":""},"limits":{"cpu":"","memory":""}},"teamId":"","allowedSourceRanges":null,"numberOfInstances":0,"users":null,"clone":{}},"status":"Invalid"}`), nil},
 	{[]byte(`{

pkg/apiserver/apiserver.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"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/cluster/cluster.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"k8s.io/api/apps/v1beta1"
 	"k8s.io/api/core/v1"
 	policybeta1 "k8s.io/api/policy/v1beta1"

pkg/cluster/cluster_test.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	acidv1 "github.com/zalando-incubator/postgres-operator/pkg/apis/acid.zalan.do/v1"
 	"github.com/zalando-incubator/postgres-operator/pkg/spec"
 	"github.com/zalando-incubator/postgres-operator/pkg/util/config"
@@ -256,7 +256,7 @@ func TestInitHumanUsersWithSuperuserTeams(t *testing.T) {
 			ownerTeam: "postgres_superusers",
 			existingRoles: map[string]spec.PgUser{
 				// role with the name exists before  w/o superuser privilege
-				"postgres_superuser": spec.PgUser{
+				"postgres_superuser": {
 					Origin:     spec.RoleOriginTeamsAPI,
 					Name:       "postgres_superuser",
 					Password:   "",

pkg/cluster/k8sres.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 
 	"k8s.io/api/apps/v1beta1"
 	"k8s.io/api/core/v1"

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", 
+		{ "apiVersion": "v1",
-		  "kind": "ServiceAccount", 
+		  "kind": "ServiceAccount",
-		  "metadata": { 
+		  "metadata": {
-				 "name": "operator" 
+				 "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", 
+			"kind": "RoleBinding",
-			"metadata": { 
+			"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

pkg/spec/types.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/rest"
 )

pkg/util/patroni/patroni.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"k8s.io/api/core/v1"
 )
 

pkg/util/teams/teams.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 // InfrastructureAccount defines an account of the team on some infrastructure (i.e AWS, Google) platform.

pkg/util/teams/teams_test.go

@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 var (