Merge branch 'master' of https://github.com/zalando/postgres-operator into standby

manifests/complete-postgres-manifest.yaml

@@ -47,13 +47,13 @@ spec:
     pg_hba:
     - hostssl all all 0.0.0.0/0 md5
     - host    all all 0.0.0.0/0 md5
-    slots:
-      permanent_physical_1:
-        type: physical
-      permanent_logical_1:
-        type: logical
-        database: foo
-        plugin: pgoutput
+    #slots:
+    #  permanent_physical_1:
+    #    type: physical
+    #  permanent_logical_1:
+    #    type: logical
+    #    database: foo
+    #    plugin: pgoutput
     ttl: 30
     loop_wait: &loop_wait 10
     retry_timeout: 10

manifests/configmap.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: postgres-operator
-data:  
+data:
   watched_namespace: "*" # listen to all namespaces
   cluster_labels: application:spilo
   cluster_name_label: version
@@ -10,9 +10,10 @@ data:
 
   debug_logging: "true"
   workers: "4"
-  docker_image: registry.opensource.zalan.do/acid/spilo-cdp-11:1.5-p70
+  docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7
   pod_service_account_name: "zalando-postgres-operator"
   secret_name_template: '{username}.{cluster}.credentials'
+  cluster_domain: cluster.local
   super_username: postgres
   enable_teams_api: "false"
   spilo_privileged: "false"
@@ -54,3 +55,7 @@ data:
   resource_check_interval: 3s
   resource_check_timeout: 10m
   resync_period: 5m
+
+  # logical_backup_schedule: "30 00 * * *"
+  # logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
+  # logical_backup_s3_bucket: ""

manifests/minimal-postgres-manifest.yaml

@@ -17,7 +17,6 @@ spec:
     # role for application foo
     foo_user: []
 
-  
   #databases: name->owner
   databases:
     foo: zalando

manifests/operator-service-account-rbac.yaml

@@ -26,6 +26,7 @@ rules:
   - create
   - get
   - patch
+  - update
 - apiGroups:
   - ""
   resources:
@@ -141,7 +142,17 @@ rules:
   - bind
   resourceNames:
   - zalando-postgres-operator
-
+- apiGroups:
+  - batch
+  resources:
+  - cronjobs # enables logical backups
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding

manifests/postgresql-operator-default-configuration.yaml

@@ -4,7 +4,7 @@ metadata:
   name: postgresql-operator-default-configuration
 configuration:
   etcd_host: ""
-  docker_image: registry.opensource.zalan.do/acid/spilo-cdp-11:1.5-p42
+  docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7
   workers: 4
   min_instances: -1
   max_instances: -1
@@ -21,8 +21,10 @@ configuration:
     pod_terminate_grace_period: 5m
     pdb_name_format: "postgres-{cluster}-pdb"
     secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}"
+    cluster_domain: cluster.local
     oauth_token_secret_name: postgresql-operator
     pod_role_label: spilo-role
+    # spilo_fsgroup: 103
     spilo_privileged: false
     cluster_labels:
         application: spilo
@@ -36,7 +38,7 @@ configuration:
     # infrastructure_roles_secret_name: ""
     # pod_environment_configmap: ""
     pod_management_policy: "ordered_ready"
-    enable_pod_antiaffinity: "false"
+    enable_pod_antiaffinity: false
     pod_antiaffinity_topology_key: "kubernetes.io/hostname"
   postgres_pod_resources:
     default_cpu_request: 100m
@@ -91,4 +93,7 @@ configuration:
     # scalyr_api_key: ""
     # scalyr_image: ""
     # scalyr_server_url: ""
-
+  logical_backup:
+    logical_backup_schedule: "30 00 * * *"
+    logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
+    logical_backup_s3_bucket: ""