Merge branch 'master' into bump-v1.5.0

manifests/configmap.yaml

@@ -30,6 +30,7 @@ data:
   # default_memory_limit: 500Mi
   # default_memory_request: 100Mi
   docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115
+  # downscaler_annotations: "deployment-time,downscaler/*"
   # enable_admin_role_for_users: "true"
   # enable_crd_validation: "true"
   # enable_database_access: "true"
@@ -49,16 +50,16 @@ data:
   # inherited_labels: application,environment
   # kube_iam_role: ""
   # log_s3_bucket: ""
-  # logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
+  logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
   # logical_backup_s3_access_key_id: ""
-  # logical_backup_s3_bucket: "my-bucket-url"
+  logical_backup_s3_bucket: "my-bucket-url"
   # logical_backup_s3_region: ""
   # logical_backup_s3_endpoint: ""
   # logical_backup_s3_secret_access_key: ""
-  # logical_backup_s3_sse: "AES256"
-  # logical_backup_schedule: "30 00 * * *"
+  logical_backup_s3_sse: "AES256"
+  logical_backup_schedule: "30 00 * * *"
   master_dns_name_format: "{cluster}.{team}.{hostedzone}"
-  # master_pod_move_timeout: 10m
+  # master_pod_move_timeout: 20m
   # max_instances: "-1"
   # min_instances: "-1"
   # min_cpu_limit: 250m

manifests/operatorconfiguration.crd.yaml

@@ -93,6 +93,10 @@ spec:
                   type: object
                   additionalProperties:
                     type: string
+                downscaler_annotations:
+                  type: array
+                  items:
+                    type: string
                 enable_init_containers:
                   type: boolean
                 enable_pod_antiaffinity:

manifests/postgresql-operator-default-configuration.yaml

@@ -31,6 +31,9 @@ configuration:
     # custom_pod_annotations:
     #   keya: valuea
     #   keyb: valueb
+    # downscaler_annotations:
+    # - deployment-time
+    # - downscaler/*
     enable_init_containers: true
     enable_pod_antiaffinity: false
     enable_pod_disruption_budget: true