From c9ea5856af5dc7e27a1ec90d43a661602a4bc944 Mon Sep 17 00:00:00 2001
From: Rafia Sabih <rafia.sabih@zalando.de>
Date: Thu, 30 Apr 2020 15:51:19 +0200
Subject: [PATCH] Update manifests

---
 charts/postgres-operator/values-crd.yaml                 | 7 +++++--
 charts/postgres-operator/values.yaml                     | 3 +++
 manifests/operatorconfiguration.crd.yaml                 | 8 ++++----
 manifests/postgresql-operator-default-configuration.yaml | 6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml
index e6428c478..124360392 100644
--- a/charts/postgres-operator/values-crd.yaml
+++ b/charts/postgres-operator/values-crd.yaml
@@ -55,6 +55,9 @@ configUsers:
   super_username: postgres
 
 configKubernetes:
+  # downscaler_annotations:
+  #   - deployment-time
+  #   - downscaler/*
   # default DNS domain of K8s cluster where operator is running
   cluster_domain: cluster.local
   # additional labels assigned to the cluster objects
@@ -262,11 +265,11 @@ configConnectionPooler:
   # docker image
   connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer"
   # max db connections the pooler should hold
-  connection_pooler_max_db_connections: "60"
+  connection_pooler_max_db_connections: 60
   # default pooling mode
   connection_pooler_mode: "transaction"
   # number of pooler instances
-  connection_pooler_number_of_instances: "2"
+  connection_pooler_number_of_instances: 2
   # default resources
   connection_pooler_default_cpu_request: 500m
   connection_pooler_default_memory_request: 100Mi
diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml
index e5cdcee47..a48fd5d87 100644
--- a/charts/postgres-operator/values.yaml
+++ b/charts/postgres-operator/values.yaml
@@ -54,6 +54,9 @@ configUsers:
   super_username: postgres
 
 configKubernetes:
+  # downscaler_annotations:
+  #   - deployment-time
+  #   - downscaler/*
   # default DNS domain of K8s cluster where operator is running
   cluster_domain: cluster.local
   # additional labels assigned to the cluster objects
diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml
index 57c44aee8..2f947b336 100644
--- a/manifests/operatorconfiguration.crd.yaml
+++ b/manifests/operatorconfiguration.crd.yaml
@@ -34,10 +34,6 @@ spec:
         configuration:
           type: object
           properties:
-            # downscaler_annotations:
-            #   type: array
-            #   items:
-            #     type: string
             docker_image:
               type: string
             enable_crd_validation:
@@ -85,6 +81,10 @@ spec:
             kubernetes:
               type: object
               properties:
+                # downscaler_annotations:
+                #   type: array
+                #   items:
+                #     type: string
                 cluster_domain:
                   type: string
                 cluster_labels:
diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml
index 93c305232..36bfbeefc 100644
--- a/manifests/postgresql-operator-default-configuration.yaml
+++ b/manifests/postgresql-operator-default-configuration.yaml
@@ -4,9 +4,6 @@ metadata:
   name: postgresql-operator-default-configuration
 configuration:
   docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115
-  # downscaler_annotations:
-  #   - deployment-time
-  #   - downscaler/*
   # enable_crd_validation: true
   # enable_lazy_spilo_upgrade: false
   # enable_shm_volume: true
@@ -27,6 +24,9 @@ configuration:
     replication_username: standby
     super_username: postgres
   kubernetes:
+    # downscaler_annotations:
+    #   - deployment-time
+    #   - downscaler/*
     cluster_domain: cluster.local
     cluster_labels:
       application: spilo