merge master

manifests/complete-postgres-manifest.yaml

@@ -63,10 +63,14 @@ spec:
   #  uid: "efd12e58-5786-11e8-b5a7-06148230260c"
   #  cluster: "acid-batman"
   #  timestamp: "2017-12-19T12:40:33+01:00" # timezone required (offset relative to UTC, see RFC 3339 section 5.6)
+<<<<<<< HEAD
   
   # run periodic backups with k8s cron jobs
   # enableLogicalBackup: true
   # logicalBackupSchedule: "30 00 * * *"
+=======
+  #  s3_wal_path: "s3://custom/path/to/bucket"
+>>>>>>> master
   maintenanceWindows:
   - 01:00-06:00 #UTC
   - Sat:00:00-04:00

manifests/operator-service-account-rbac.yaml

@@ -14,6 +14,7 @@ rules:
   - acid.zalan.do
   resources:
   - postgresqls
+  - postgresqls/status
   - operatorconfigurations
   verbs:
   - "*"
@@ -24,6 +25,8 @@ rules:
   verbs:
   - create
   - get
+  - patch
+  - update
 - apiGroups:
   - ""
   resources:
@@ -137,7 +140,7 @@ rules:
   - clusterroles
   verbs:
   - bind
-  resourceNames: 
+  resourceNames:
   - zalando-postgres-operator
 - apiGroups:
   - batch