resolve conflict with latest config sync

manifests/complete-postgres-manifest.yaml

@@ -9,7 +9,7 @@ metadata:
 #    "delete-date": "2020-08-31"  # can only be deleted on that day if "delete-date "key is configured
 #    "delete-clustername": "acid-test-cluster"  # can only be deleted when name matches if "delete-clustername" key is configured
 spec:
-  dockerImage: registry.opensource.zalan.do/acid/spilo-13:2.1-p1
+  dockerImage: registry.opensource.zalan.do/acid/spilo-14:2.1-p2
   teamId: "acid"
   numberOfInstances: 2
   users:  # Application/Robot users
@@ -36,7 +36,7 @@ spec:
           defaultRoles: true
           defaultUsers: false
   postgresql:
-    version: "13"
+    version: "14"
     parameters:  # Expert section
       shared_buffers: "32MB"
       max_connections: "10"

manifests/configmap.yaml

@@ -32,7 +32,7 @@ data:
   # default_memory_request: 100Mi
   # delete_annotation_date_key: delete-date
   # delete_annotation_name_key: delete-clustername
-  docker_image: registry.opensource.zalan.do/acid/spilo-13:2.1-p1
+  docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p2
   # downscaler_annotations: "deployment-time,downscaler/*"
   # enable_admin_role_for_users: "true"
   # enable_crd_validation: "true"
@@ -83,7 +83,7 @@ data:
   # min_instances: "-1"
   # min_cpu_limit: 250m
   # min_memory_limit: 250Mi
-  # minimal_major_version: "9.5"
+  # minimal_major_version: "9.6"
   # node_readiness_label: ""
   # oauth_token_secret_name: postgresql-operator
   # pam_configuration: |
@@ -114,7 +114,7 @@ data:
   resync_period: 30m
   ring_log_lines: "100"
   role_deletion_suffix: "_deleted"
-  secret_name_template: "{username}.{cluster}.credentials"
+  secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}"
   # sidecar_docker_images: ""
   # set_memory_request_to_limit: "false"
   spilo_allow_privilege_escalation: "true"
@@ -124,11 +124,11 @@ data:
   spilo_privileged: "false"
   storage_resize_mode: "pvc"
   super_username: postgres
-  # target_major_version: "13"
+  # target_major_version: "14"
   # team_admin_role: "admin"
   # team_api_role_configuration: "log_statement:all"
   # teams_api_url: http://fake-teams-api.default.svc.cluster.local
-  # toleration: ""
+  # toleration: "key:db-only,operator:Exists,effect:NoSchedule"
   # wal_az_storage_account: ""
   # wal_gs_bucket: ""
   # wal_s3_bucket: ""

manifests/minimal-postgres-manifest.yaml

@@ -18,4 +18,4 @@ spec:
   preparedDatabases:
     bar: {}
   postgresql:
-    version: "13"
+    version: "14"

manifests/operatorconfiguration.crd.yaml

@@ -61,7 +61,7 @@ spec:
             properties:
               docker_image:
                 type: string
-                default: "registry.opensource.zalan.do/acid/spilo-13:2.1-p1"
+                default: "registry.opensource.zalan.do/acid/spilo-14:2.1-p2"
               enable_crd_validation:
                 type: boolean
                 default: true
@@ -131,10 +131,10 @@ spec:
                     default: "off"
                   minimal_major_version:
                     type: string
-                    default: "9.5"
+                    default: "9.6"
                   target_major_version:
                     type: string
-                    default: "13"
+                    default: "14"
               kubernetes:
                 type: object
                 properties:

manifests/postgresql-operator-default-configuration.yaml

@@ -3,7 +3,7 @@ kind: OperatorConfiguration
 metadata:
   name: postgresql-operator-default-configuration
 configuration:
-  docker_image: registry.opensource.zalan.do/acid/spilo-13:2.1-p1
+  docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p2
   # enable_crd_validation: true
   # enable_lazy_spilo_upgrade: false
   enable_pgversion_env_var: true
@@ -28,8 +28,8 @@ configuration:
     super_username: postgres
   major_version_upgrade:
     major_version_upgrade_mode: "off"
-    minimal_major_version: "9.5"
-    target_major_version: "13"
+    minimal_major_version: "9.6"
+    target_major_version: "14"
   kubernetes:
     # additional_pod_capabilities:
     # - "SYS_NICE"
@@ -86,7 +86,10 @@ configuration:
     # spilo_fsgroup: 103
     spilo_privileged: false
     storage_resize_mode: pvc
-    # toleration: {}
+    # toleration:
+    #   key: db-only
+    #   operator: Exists
+    #   effect: NoSchedule
     # watched_namespace: ""
   postgres_pod_resources:
     default_cpu_limit: "1"

manifests/postgresql.crd.yaml

@@ -358,14 +358,13 @@ spec:
                   version:
                     type: string
                     enum:
-                      - "9.3"
-                      - "9.4"
                       - "9.5"
                       - "9.6"
                       - "10"
                       - "11"
                       - "12"
                       - "13"
+                      - "14"
                   parameters:
                     type: object
                     additionalProperties:

manifests/standby-manifest.yaml

@@ -9,7 +9,7 @@ spec:
     size: 1Gi
   numberOfInstances: 1
   postgresql:
-    version: "13"
+    version: "14"
 # Make this a standby cluster and provide the s3 bucket path of source cluster for continuous streaming.
   standby:
     s3_wal_path: "s3://path/to/bucket/containing/wal/of/source/cluster/"