resolve conflict with latest config sync

charts/postgres-operator-ui/templates/deployment.yaml

@@ -71,6 +71,7 @@ spec:
                   "resources_visible": true,
                   "users_visible": true,
                   "postgresql_versions": [
+                    "14",
                     "13",
                     "12",
                     "11"

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -65,7 +65,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
@@ -135,10 +135,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:

charts/postgres-operator/crds/postgresqls.yaml

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

charts/postgres-operator/values.yaml

@@ -28,14 +28,14 @@ configGeneral:
   enable_pgversion_env_var: true
   # start any new database pod without limitations on shm memory
   enable_shm_volume: true
-  # enables backwards compatible path between Spilo 12 and Spilo 13 images
+  # enables backwards compatible path between Spilo 12 and Spilo 13+ images
   enable_spilo_wal_path_compat: false
   # etcd connection string for Patroni. Empty uses K8s-native DCS.
   etcd_host: ""
   # Select if setup uses endpoints (default), or configmaps to manage leader (DCS=k8s)
   # kubernetes_use_configmaps: false
   # Spilo docker image
-  docker_image: registry.opensource.zalan.do/acid/spilo-13:2.1-p1
+  docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p2
   # min number of instances in Postgres cluster. -1 = no limit
   min_instances: -1
   # max number of instances in Postgres cluster. -1 = no limit
@@ -65,9 +65,9 @@ configMajorVersionUpgrade:
   # "off": no upgrade, "manual": manifest triggers action, "full": minimal version violation triggers too
   major_version_upgrade_mode: "off"
   # minimal Postgres major version that will not automatically be upgraded
-  minimal_major_version: "9.5"
+  minimal_major_version: "9.6"
   # target Postgres major version when upgrading clusters automatically
-  target_major_version: "13"
+  target_major_version: "14"
 
 configKubernetes:
   # list of additional capabilities for postgres container
@@ -168,6 +168,12 @@ configKubernetes:
   spilo_allow_privilege_escalation: true
   # storage resize strategy, available options are: ebs, pvc, off
   storage_resize_mode: pvc
+  # pod toleration assigned to instances of every Postgres cluster
+  # toleration:
+  #   key: db-only
+  #   operator: Exists
+  #   effect: NoSchedule
+
   # operator watches for postgres objects in the given namespace
   watched_namespace: "*"  # listen to all namespaces