public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-06 16:41:15 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
erthalion
2018-09-24 10:28:19 +02:00
parent b0756a1f75 688d252752
commit dc8f169a00
15 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/cluster.go
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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"