resolve merge conflicts

manifests/complete-postgres-manifest.yaml

@@ -4,6 +4,10 @@ kind: postgresql
 metadata:
   name: acid-test-cluster
 spec:
+  init_containers:
+  - name: date
+    image: busybox
+    command: [ "/bin/date" ]
   teamId: "ACID"
   volume:
     size: 1Gi

manifests/configmap.yaml

@@ -10,11 +10,13 @@ data:
 
   debug_logging: "true"
   workers: "4"
-  docker_image: registry.opensource.zalan.do/acid/spilo-cdp-11:1.5-p42
+  docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p4
   pod_service_account_name: "zalando-postgres-operator"
   secret_name_template: '{username}.{cluster}.credentials'
   super_username: postgres
   enable_teams_api: "false"
+  # custom_service_annotations:
+  #   "keyx:valuez,keya:valuea"
   # set_memory_request_to_limit: "true"
   # postgres_superuser_teams: "postgres_superusers"
   # enable_team_superuser: "false"

manifests/minimal-postgres-manifest.yaml

@@ -2,7 +2,7 @@ apiVersion: "acid.zalan.do/v1"
 kind: postgresql
 metadata:
   name: acid-minimal-cluster
-  namespace: test # assumes namespace exists beforehand
+  namespace: default 
 spec:
   teamId: "ACID"
   volume:

manifests/postgres-operator.yaml

@@ -12,7 +12,7 @@ spec:
       serviceAccountName: zalando-postgres-operator
       containers:
       - name: postgres-operator
-        image: registry.opensource.zalan.do/acid/smoke-tested-postgres-operator:v1.0.0-21-ge39915c
+        image: registry.opensource.zalan.do/acid/smoke-tested-postgres-operator:v1.0.0-37-g2422d72
         imagePullPolicy: IfNotPresent
         resources:
           requests:

manifests/postgresql-operator-default-configuration.yaml

@@ -25,8 +25,11 @@ configuration:
     pod_role_label: spilo-role
     cluster_labels:
         application: spilo
+    # inherited_labels:
+    # - application
+    # - app
     cluster_name_label: cluster-name
-    # watched_namespace:"" 
+    # watched_namespace:""
     # node_readiness_label: ""
     # toleration: {}
     # infrastructure_roles_secret_name: ""
@@ -46,11 +49,14 @@ configuration:
   load_balancer:
     enable_master_load_balancer: false
     enable_replica_load_balancer: false
+    # custom_service_annotations:
+    #   keyx: valuex
+    #   keyy: valuey
     master_dns_name_format: "{cluster}.{team}.{hostedzone}"
     replica_dns_name_format: "{cluster}-repl.{team}.{hostedzone}"
   aws_or_gcp:
     # db_hosted_zone: ""
-    # wal_s3_bucket: "" 
+    # wal_s3_bucket: ""
     # log_s3_bucket: ""
     # kube_iam_role: ""
     aws_region: eu-central-1
@@ -59,13 +65,13 @@ configuration:
     enable_database_access: true
   teams_api:
     enable_teams_api: false
-    team_api_role_configuration: 
+    team_api_role_configuration:
       log_statement: all
     enable_team_superuser: false
     team_admin_role: admin
     pam_role_name: zalandos
     # pam_configuration: ""
-    protected_role_names: 
+    protected_role_names:
       - admin
     # teams_api_url: ""
     # postgres_superuser_teams: "postgres_superusers"