bump operator to v1.6.3 (#1503)

FxKu · web-flow · commit a37e78bd9a7f · 2021-05-28T11:53:10.000+02:00
diff --git a/.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md b/.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md
@@ -9,7 +9,7 @@ assignees: ''
 
 Please, answer some short questions which should help us to understand your problem / question better?
 
-- **Which image of the operator are you using?** e.g. registry.opensource.zalan.do/acid/postgres-operator:v1.6.2
+- **Which image of the operator are you using?** e.g. registry.opensource.zalan.do/acid/postgres-operator:v1.6.3
 - **Where do you run it - cloud or metal? Kubernetes or OpenShift?** [AWS K8s | GCP ... | Bare Metal K8s]
 - **Are you running Postgres Operator in production?** [yes | no]
 - **Type of issue?** [Bug report, question, feature request, etc.]
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ We introduce the major version into the backup path to smoothen the [major versi
 The new operator configuration can set a compatibility flag *enable_spilo_wal_path_compat* to make Spilo look for wal segments in the current path but also old format paths.
 This comes at potential performance costs and should be disabled after a few days.
 
-The newest Spilo 13 image is: `registry.opensource.zalan.do/acid/spilo-13:2.0-p6`
+The newest Spilo 13 image is: `registry.opensource.zalan.do/acid/spilo-13:2.0-p7`
 
 The last Spilo 12 image is: `registry.opensource.zalan.do/acid/spilo-12:1.6-p5`
 
diff --git a/charts/postgres-operator-ui/Chart.yaml b/charts/postgres-operator-ui/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: postgres-operator-ui
-version: 1.6.2
-appVersion: 1.6.2
+version: 1.6.3
+appVersion: 1.6.3
 home: https://github.com/zalando/postgres-operator
 description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience
 keywords:
diff --git a/charts/postgres-operator-ui/index.yaml b/charts/postgres-operator-ui/index.yaml
@@ -1,9 +1,31 @@
 apiVersion: v1
 entries:
   postgres-operator-ui:
+  - apiVersion: v1
+    appVersion: 1.6.3
+    created: "2021-05-27T19:04:33.425637932+02:00"
+    description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience
+    digest: 08b810aa632dcc719e4785ef184e391267f7c460caa99677f2d00719075aac78
+    home: https://github.com/zalando/postgres-operator
+    keywords:
+    - postgres
+    - operator
+    - ui
+    - cloud-native
+    - patroni
+    - spilo
+    maintainers:
+    - email: opensource@zalando.de
+      name: Zalando
+    name: postgres-operator-ui
+    sources:
+    - https://github.com/zalando/postgres-operator
+    urls:
+    - postgres-operator-ui-1.6.3.tgz
+    version: 1.6.3
   - apiVersion: v1
     appVersion: 1.6.2
-    created: "2021-04-06T16:47:40.993908218+02:00"
+    created: "2021-05-27T19:04:33.422124263+02:00"
     description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience
     digest: 14d1559bb0bd1e1e828f2daaaa6f6ac9ffc268d79824592c3589b55dd39241f6
     home: https://github.com/zalando/postgres-operator
@@ -25,7 +47,7 @@ entries:
     version: 1.6.2
   - apiVersion: v1
     appVersion: 1.6.1
-    created: "2021-04-06T16:47:40.993378451+02:00"
+    created: "2021-05-27T19:04:33.419640902+02:00"
     description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience
     digest: 3d321352f2f1e7bb7450aa8876e3d818aa9f9da9bd4250507386f0490f2c1969
     home: https://github.com/zalando/postgres-operator
@@ -47,7 +69,7 @@ entries:
     version: 1.6.1
   - apiVersion: v1
     appVersion: 1.6.0
-    created: "2021-04-06T16:47:40.992871656+02:00"
+    created: "2021-05-27T19:04:33.41788193+02:00"
     description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience
     digest: 1e0aa1e7db3c1daa96927ffbf6fdbcdb434562f961833cb5241ddbe132220ee4
     home: https://github.com/zalando/postgres-operator
@@ -69,7 +91,7 @@ entries:
     version: 1.6.0
   - apiVersion: v1
     appVersion: 1.5.0
-    created: "2021-04-06T16:47:40.992346484+02:00"
+    created: "2021-05-27T19:04:33.416056821+02:00"
     description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience
     digest: c91ea39e6d51d57f4048fb1b6ec53b40823f2690eb88e4e4f1a036367b9fdd61
     home: https://github.com/zalando/postgres-operator
@@ -89,4 +111,4 @@ entries:
     urls:
     - postgres-operator-ui-1.5.0.tgz
     version: 1.5.0
-generated: "2021-04-06T16:47:40.991668273+02:00"
+generated: "2021-05-27T19:04:33.41380858+02:00"
diff --git a/charts/postgres-operator-ui/postgres-operator-ui-1.6.3.tgz b/charts/postgres-operator-ui/postgres-operator-ui-1.6.3.tgz
diff --git a/charts/postgres-operator-ui/values.yaml b/charts/postgres-operator-ui/values.yaml
@@ -8,7 +8,7 @@ replicaCount: 1
 image:
   registry: registry.opensource.zalan.do
   repository: acid/postgres-operator-ui
-  tag: v1.6.2
+  tag: v1.6.3
   pullPolicy: "IfNotPresent"
 
 # Optionally specify an array of imagePullSecrets.
diff --git a/charts/postgres-operator/Chart.yaml b/charts/postgres-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: postgres-operator
-version: 1.6.2
-appVersion: 1.6.2
+version: 1.6.3
+appVersion: 1.6.3
 home: https://github.com/zalando/postgres-operator
 description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
 keywords:
diff --git a/charts/postgres-operator/crds/operatorconfigurations.yaml b/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.0-p6"
+                default: "registry.opensource.zalan.do/acid/spilo-13:2.0-p7"
               enable_crd_validation:
                 type: boolean
                 default: true
@@ -397,7 +397,7 @@ spec:
                 properties:
                   logical_backup_docker_image:
                     type: string
-                    default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2"
+                    default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.3"
                   logical_backup_google_application_credentials:
                     type: string
                   logical_backup_job_prefix:
diff --git a/charts/postgres-operator/crds/postgresqls.yaml b/charts/postgres-operator/crds/postgresqls.yaml
@@ -27,7 +27,7 @@ spec:
     additionalPrinterColumns:
     - name: Team
       type: string
-      description: Team responsible for Postgres CLuster
+      description: Team responsible for Postgres cluster
       jsonPath: .spec.teamId
     - name: Version
       type: string
diff --git a/charts/postgres-operator/index.yaml b/charts/postgres-operator/index.yaml
@@ -1,9 +1,30 @@
 apiVersion: v1
 entries:
   postgres-operator:
+  - apiVersion: v1
+    appVersion: 1.6.3
+    created: "2021-05-27T19:04:25.199523943+02:00"
+    description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
+    digest: ea08f991bf23c9ad114bca98ebcbe3e2fa15beab163061399394905eaee89b35
+    home: https://github.com/zalando/postgres-operator
+    keywords:
+    - postgres
+    - operator
+    - cloud-native
+    - patroni
+    - spilo
+    maintainers:
+    - email: opensource@zalando.de
+      name: Zalando
+    name: postgres-operator
+    sources:
+    - https://github.com/zalando/postgres-operator
+    urls:
+    - postgres-operator-1.6.3.tgz
+    version: 1.6.3
   - apiVersion: v1
     appVersion: 1.6.2
-    created: "2021-03-30T17:00:50.171986449+02:00"
+    created: "2021-05-27T19:04:25.198182197+02:00"
     description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
     digest: d886f8a0879ca07d1e5246ee7bc55710e1c872f3977280fe495db6fc2057a7f4
     home: https://github.com/zalando/postgres-operator
@@ -24,7 +45,7 @@ entries:
     version: 1.6.2
   - apiVersion: v1
     appVersion: 1.6.1
-    created: "2021-03-30T17:00:50.170294515+02:00"
+    created: "2021-05-27T19:04:25.19687586+02:00"
     description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
     digest: 4ba5972cd486dcaa2d11c5613a6f97f6b7b831822e610fe9e10a57ea1db23556
     home: https://github.com/zalando/postgres-operator
@@ -45,7 +66,7 @@ entries:
     version: 1.6.1
   - apiVersion: v1
     appVersion: 1.6.0
-    created: "2021-03-30T17:00:50.168493689+02:00"
+    created: "2021-05-27T19:04:25.195600766+02:00"
     description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
     digest: f52149718ea364f46b4b9eec9a65f6253ad182bb78df541d14cd5277b9c8a8c3
     home: https://github.com/zalando/postgres-operator
@@ -66,7 +87,7 @@ entries:
     version: 1.6.0
   - apiVersion: v1
     appVersion: 1.5.0
-    created: "2021-03-30T17:00:50.166722286+02:00"
+    created: "2021-05-27T19:04:25.193985032+02:00"
     description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
     digest: 198351d5db52e65cdf383d6f3e1745d91ac1e2a01121f8476f8b1be728b09531
     home: https://github.com/zalando/postgres-operator
@@ -85,4 +106,4 @@ entries:
     urls:
     - postgres-operator-1.5.0.tgz
     version: 1.5.0
-generated: "2021-03-30T17:00:50.165166707+02:00"
+generated: "2021-05-27T19:04:25.191897769+02:00"
diff --git a/charts/postgres-operator/postgres-operator-1.6.3.tgz b/charts/postgres-operator/postgres-operator-1.6.3.tgz
diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml
@@ -1,7 +1,7 @@
 image:
   registry: registry.opensource.zalan.do
   repository: acid/postgres-operator
-  tag: v1.6.2
+  tag: v1.6.3
   pullPolicy: "IfNotPresent"
 
 # Optionally specify an array of imagePullSecrets.
@@ -32,7 +32,7 @@ configGeneral:
   # 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.0-p6
+  docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p7
   # min number of instances in Postgres cluster. -1 = no limit
   min_instances: -1
   # max number of instances in Postgres cluster. -1 = no limit
@@ -263,7 +263,7 @@ configAwsOrGcp:
 # configure K8s cron job managed by the operator
 configLogicalBackup:
   # image for pods of the logical backup job (example runs pg_dumpall)
-  logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2"
+  logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.3"
   # path of google cloud service account json file
   # logical_backup_google_application_credentials: ""
 
diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml
@@ -1,7 +1,7 @@
 image:
   registry: registry.opensource.zalan.do
   repository: acid/postgres-operator
-  tag: v1.6.2
+  tag: v1.6.3
   pullPolicy: "IfNotPresent"
 
 # Optionally specify an array of imagePullSecrets.
@@ -35,7 +35,7 @@ configGeneral:
   # 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.0-p6
+  docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p7
   # min number of instances in Postgres cluster. -1 = no limit
   min_instances: "-1"
   # max number of instances in Postgres cluster. -1 = no limit
@@ -253,7 +253,7 @@ configAwsOrGcp:
 # configure K8s cron job managed by the operator
 configLogicalBackup:
   # image for pods of the logical backup job (example runs pg_dumpall)
-  logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2"
+  logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.3"
   # path of google cloud service account json file
   # logical_backup_google_application_credentials: ""
 
diff --git a/docs/administrator.md b/docs/administrator.md
@@ -950,7 +950,7 @@ make docker
 
 # build in image in minikube docker env
 eval $(minikube docker-env)
-docker build -t registry.opensource.zalan.do/acid/postgres-operator-ui:v1.6.2 .
+docker build -t registry.opensource.zalan.do/acid/postgres-operator-ui:v1.6.3 .
 
 # apply UI manifests next to a running Postgres Operator
 kubectl apply -f manifests/
diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md
@@ -593,7 +593,7 @@ grouped under the `logical_backup` key.
   runs `pg_dumpall` on a replica if possible and uploads compressed results to
   an S3 bucket under the key `/spilo/pg_cluster_name/cluster_k8s_uuid/logical_backups`.
   The default image is the same image built with the Zalando-internal CI
-  pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2"
+  pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.3"
 
 * **logical_backup_google_application_credentials**
   Specifies the path of the google cloud service account json file. Default is empty.
diff --git a/e2e/tests/test_e2e.py b/e2e/tests/test_e2e.py
@@ -230,7 +230,7 @@ def test_additional_teams_and_members(self):
               FROM pg_catalog.pg_roles
              WHERE rolname IN ('elephant', 'kind');
         """
-        self.eventuallyEqual(lambda: len(self.query_database(leader.metadata.name, "postgres", user_query)), 2, 
+        self.eventuallyEqual(lambda: len(self.query_database(leader.metadata.name, "postgres", user_query)), 2,
             "Not all additional users found in database", 10, 5)
 
         # replace additional member and check if the removed member's role is renamed
@@ -458,7 +458,7 @@ def test_enable_disable_connection_pooler(self):
 
         db_list = self.list_databases(leader.metadata.name)
         for db in db_list:
-            self.eventuallyNotEqual(lambda: len(self.query_database(leader.metadata.name, db, schemas_query)), 0, 
+            self.eventuallyNotEqual(lambda: len(self.query_database(leader.metadata.name, db, schemas_query)), 0,
                 "Pooler schema not found in database {}".format(db))
 
         # remove config section to make test work next time
@@ -789,7 +789,7 @@ def test_min_resource_limits(self):
             }
         }
         k8s.api.custom_objects_api.patch_namespaced_custom_object(
-            "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_resources)          
+            "acid.zalan.do", "v1", "default", "postgresqls", "acid-minimal-cluster", pg_patch_resources)
         self.eventuallyEqual(lambda: k8s.get_operator_state(), {"0": "idle"}, "Operator does not get in sync")
 
         self.eventuallyEqual(lambda: k8s.count_running_pods(), 2, "No two pods running after lazy rolling upgrade")
diff --git a/manifests/complete-postgres-manifest.yaml b/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.0-p6
+  dockerImage: registry.opensource.zalan.do/acid/spilo-13:2.0-p7
   teamId: "acid"
   numberOfInstances: 2
   users:  # Application/Robot users
diff --git a/manifests/configmap.yaml b/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.0-p6
+  docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p7
   # downscaler_annotations: "deployment-time,downscaler/*"
   # enable_admin_role_for_users: "true"
   # enable_crd_validation: "true"
@@ -64,7 +64,7 @@ data:
   # inherited_labels: application,environment
   # kube_iam_role: ""
   # log_s3_bucket: ""
-  logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2"
+  logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.3"
   # logical_backup_google_application_credentials: ""
   logical_backup_job_prefix: "logical-backup-"
   logical_backup_provider: "s3"
diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml
@@ -61,7 +61,7 @@ spec:
             properties:
               docker_image:
                 type: string
-                default: "registry.opensource.zalan.do/acid/spilo-13:2.0-p6"
+                default: "registry.opensource.zalan.do/acid/spilo-13:2.0-p7"
               enable_crd_validation:
                 type: boolean
                 default: true
@@ -393,7 +393,7 @@ spec:
                 properties:
                   logical_backup_docker_image:
                     type: string
-                    default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2"
+                    default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.3"
                   logical_backup_google_application_credentials:
                     type: string
                   logical_backup_job_prefix:
diff --git a/manifests/postgres-operator.yaml b/manifests/postgres-operator.yaml
@@ -19,7 +19,7 @@ spec:
       serviceAccountName: postgres-operator
       containers:
       - name: postgres-operator
-        image: registry.opensource.zalan.do/acid/postgres-operator:v1.6.2
+        image: registry.opensource.zalan.do/acid/postgres-operator:v1.6.3
         imagePullPolicy: IfNotPresent
         resources:
           requests:
diff --git a/manifests/postgresql-operator-default-configuration.yaml b/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.0-p6
+  docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p7
   # enable_crd_validation: true
   # enable_lazy_spilo_upgrade: false
   enable_pgversion_env_var: true
@@ -123,7 +123,7 @@ configuration:
     # wal_gs_bucket: ""
     # wal_s3_bucket: ""
   logical_backup:
-    logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2"
+    logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.3"
     # logical_backup_google_application_credentials: ""
     logical_backup_job_prefix: "logical-backup-"
     logical_backup_provider: "s3"
diff --git a/manifests/postgresql.crd.yaml b/manifests/postgresql.crd.yaml
@@ -23,7 +23,7 @@ spec:
     additionalPrinterColumns:
     - name: Team
       type: string
-      description: Team responsible for Postgres CLuster
+      description: Team responsible for Postgres cluster
       jsonPath: .spec.teamId
     - name: Version
       type: string
diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go
diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go
