add missing fields to OperatorConfiguration CRD validation

manifests/complete-postgres-manifest.yaml

@@ -6,10 +6,6 @@ metadata:
 #    environment: demo
 spec:
   dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.6-p1
-  initContainers:
-  - name: date
-    image: busybox
-    command: [ "/bin/date" ]
   teamId: "acid"
   volume:
     size: 1Gi
@@ -25,18 +21,22 @@ spec:
   - 127.0.0.1/32
   databases:
     foo: zalando
-# podAnnotations:
-#   annotation.key: value
-# Expert section
-
-  enableShmVolume: true
-#  spiloFSGroup: 103
   postgresql:
     version: "11"
-    parameters:
+    parameters: # Expert section
       shared_buffers: "32MB"
       max_connections: "10"
       log_statement: "all"
+
+  enableShmVolume: true
+#  spiloFSGroup: 103
+#  podAnnotations:
+#    annotation.key: value
+#  podPriorityClassName: "spilo-pod-priority"
+#  tolerations:
+#  - key: postgres
+#    operator: Exists
+#    effect: NoSchedule
   resources:
     requests:
       cpu: 10m
@@ -63,6 +63,7 @@ spec:
     loop_wait: &loop_wait 10
     retry_timeout: 10
     maximum_lag_on_failover: 33554432
+
 # restore a Postgres DB with point-in-time-recovery
 # with a non-empty timestamp, clone from an S3 bucket using the latest backup before the timestamp
 # with an empty/absent timestamp, clone from an existing alive cluster using pg_basebackup
@@ -75,9 +76,15 @@ spec:
 # run periodic backups with k8s cron jobs
 #  enableLogicalBackup: true
 #  logicalBackupSchedule: "30 00 * * *"
-  maintenanceWindows:
-  - 01:00-06:00  #UTC
-  - Sat:00:00-04:00
+
+#  maintenanceWindows:
+#  - 01:00-06:00  #UTC
+#  - Sat:00:00-04:00
+
+  initContainers:
+  - name: date
+    image: busybox
+    command: [ "/bin/date" ]
 #  sidecars:
 #    - name: "telegraf-sidecar"
 #      image: "telegraf:latest"

manifests/operatorconfiguration.crd.yaml

@@ -97,6 +97,8 @@ spec:
                   type: array
                   items:
                     type: string
+                master_pod_move_timeout:
+                  type: string
                 node_readiness_label:
                   type: object
                   additionalProperties:
@@ -114,10 +116,16 @@ spec:
                   enum:
                     - "ordered_ready"
                     - "parallel"
+                pod_priority_class_name:
+                  type: string
                 pod_role_label:
                   type: string
+                pod_service_account_definition:
+                  type: string
                 pod_service_account_name:
                   type: string
+                pod_service_account_role_binding_definition:
+                  type: string
                 pod_terminate_grace_period:
                   type: string
                 secret_name_template:
@@ -165,16 +173,16 @@ spec:
             load_balancer:
               type: object
               properties:
+                custom_service_annotations:
+                  type: object
+                  additionalProperties:
+                    type: string
                 db_hosted_zone:
                   type: string
                 enable_master_load_balancer:
                   type: boolean
                 enable_replica_load_balancer:
                   type: boolean
-                custom_service_annotations:
-                  type: object
-                  additionalProperties:
-                    type: string
                 master_dns_name_format:
                   type: string
                 replica_dns_name_format:
@@ -197,21 +205,21 @@ spec:
             logical_backup:
               type: object
               properties:
-                logical_backup_schedule:
-                  type: string
-                  pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
                 logical_backup_docker_image:
                   type: string
+                logical_backup_s3_access_key_id:
+                  type: string
                 logical_backup_s3_bucket:
                   type: string
                 logical_backup_s3_endpoint:
                   type: string
-                logical_backup_s3_sse:
-                  type: string
-                logical_backup_s3_access_key_id:
-                  type: string
                 logical_backup_s3_secret_access_key:
                   type: string
+                logical_backup_s3_sse:
+                  type: string
+                logical_backup_schedule:
+                  type: string
+                  pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
             debug:
               type: object
               properties:

manifests/postgresql-operator-default-configuration.yaml

@@ -21,7 +21,7 @@ configuration:
   kubernetes:
     cluster_domain: cluster.local
     cluster_labels:
-        application: spilo
+      application: spilo
     cluster_name_label: cluster-name
     # custom_pod_annotations:
     #   keya: valuea
@@ -34,6 +34,7 @@ configuration:
     # inherited_labels:
     # - application
     # - environment
+    master_pod_move_timeout: 20m
     # node_readiness_label:
     #   status: ready
     oauth_token_secret_name: postgresql-operator
@@ -41,8 +42,11 @@ configuration:
     pod_antiaffinity_topology_key: "kubernetes.io/hostname"
     # pod_environment_configmap: ""
     pod_management_policy: "ordered_ready"
+    # pod_priority_class_name: ""
     pod_role_label: spilo-role
+    # pod_service_account_definition: ""
     pod_service_account_name: zalando-postgres-operator
+    # pod_service_account_role_binding_definition: ""
     pod_terminate_grace_period: 5m
     secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}"
     # spilo_fsgroup: 103
@@ -79,10 +83,10 @@ configuration:
     # wal_s3_bucket: ""
   logical_backup:
     logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
-    logical_backup_s3_access_key_id: ""
+    # logical_backup_s3_access_key_id: ""
     logical_backup_s3_bucket: "my-bucket-url"
-    logical_backup_s3_endpoint: ""
-    logical_backup_s3_secret_access_key: ""
+    # logical_backup_s3_endpoint: ""
+    # logical_backup_s3_secret_access_key: ""
     logical_backup_s3_sse: "AES256"
     logical_backup_schedule: "30 00 * * *"
   debug:

manifests/standby-manifest.yaml

@@ -13,7 +13,3 @@ spec:
 # 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/"
-
-  maintenanceWindows:
-  - 01:00-06:00  #UTC
-  - Sat:00:00-04:00