Merge branch 'master' into major-upgrade-annotation

.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. ghcr.io/zalando/postgres-operator:v1.12.2
+- **Which image of the operator are you using?** e.g. ghcr.io/zalando/postgres-operator:v1.13.0
 - **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.]

Makefile

@@ -78,7 +78,7 @@ mocks:
 	GO111MODULE=on go generate ./...
 
 tools:
-	GO111MODULE=on go get -d k8s.io/client-go@kubernetes-1.28.10
+	GO111MODULE=on go get -d k8s.io/client-go@kubernetes-1.30.4
 	GO111MODULE=on go install github.com/golang/mock/[email protected]
 	GO111MODULE=on go mod tidy
 

README.md

@@ -57,15 +57,13 @@ production for over five years.
 
 | Release   | Postgres versions | K8s versions      | Golang  |
 | :-------- | :---------------: | :---------------: | :-----: |
-| v1.13.0*  | 12 → 16      | 1.27+             | 1.22.5  |
-| v1.12.2   | 11 → 16      | 1.27+             | 1.22.3  |
+| v1.13.0   | 12 → 16      | 1.27+             | 1.22.5  |
+| v1.12.0   | 11 → 16      | 1.27+             | 1.22.3  |
 | v1.11.0   | 11 → 16      | 1.27+             | 1.21.7  |
 | v1.10.1   | 10 → 15      | 1.21+             | 1.19.8  |
 | v1.9.0    | 10 → 15      | 1.21+             | 1.18.9  |
 | v1.8.2    | 9.5 → 14     | 1.20 → 1.24  | 1.17.4  |
 
-*not yet released
-
 ## Getting started
 
 For a quick first impression follow the instructions of this

charts/postgres-operator-ui/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: postgres-operator-ui
-version: 1.12.2
-appVersion: 1.12.2
+version: 1.13.0
+appVersion: 1.13.0
 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:

charts/postgres-operator-ui/index.yaml

@@ -2,11 +2,11 @@ apiVersion: v1
 entries:
   postgres-operator-ui:
   - apiVersion: v2
-    appVersion: 1.12.2
-    created: "2024-06-14T10:31:52.852963015+02:00"
+    appVersion: 1.13.0
+    created: "2024-08-21T18:55:36.524305158+02:00"
     description: Postgres Operator UI provides a graphical interface for a convenient
       database-as-a-service user experience
-    digest: cbcef400c23ccece27d97369ad629278265c013e0a45c0b7f33e7568a082fedd
+    digest: e0444e516b50f82002d1a733527813c51759a627cefdd1005cea73659f824ea8
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -22,14 +22,14 @@ entries:
     sources:
     - https://github.com/zalando/postgres-operator
     urls:
-    - postgres-operator-ui-1.12.2.tgz
-    version: 1.12.2
+    - postgres-operator-ui-1.13.0.tgz
+    version: 1.13.0
   - apiVersion: v2
-    appVersion: 1.11.0
-    created: "2024-06-14T10:31:52.849576888+02:00"
+    appVersion: 1.12.2
+    created: "2024-08-21T18:55:36.521875733+02:00"
     description: Postgres Operator UI provides a graphical interface for a convenient
       database-as-a-service user experience
-    digest: a45f2284045c2a9a79750a36997386444f39b01ac722b17c84b431457577a3a2
+    digest: cbcef400c23ccece27d97369ad629278265c013e0a45c0b7f33e7568a082fedd
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -45,14 +45,14 @@ entries:
     sources:
     - https://github.com/zalando/postgres-operator
     urls:
-    - postgres-operator-ui-1.11.0.tgz
-    version: 1.11.0
+    - postgres-operator-ui-1.12.2.tgz
+    version: 1.12.2
   - apiVersion: v2
-    appVersion: 1.10.1
-    created: "2024-06-14T10:31:52.843219526+02:00"
+    appVersion: 1.11.0
+    created: "2024-08-21T18:55:36.51959105+02:00"
     description: Postgres Operator UI provides a graphical interface for a convenient
       database-as-a-service user experience
-    digest: 2e5e7a82aebee519ec57c6243eb8735124aa4585a3a19c66ffd69638fbeb11ce
+    digest: a45f2284045c2a9a79750a36997386444f39b01ac722b17c84b431457577a3a2
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -68,14 +68,14 @@ entries:
     sources:
     - https://github.com/zalando/postgres-operator
     urls:
-    - postgres-operator-ui-1.10.1.tgz
-    version: 1.10.1
+    - postgres-operator-ui-1.11.0.tgz
+    version: 1.11.0
   - apiVersion: v2
-    appVersion: 1.9.0
-    created: "2024-06-14T10:31:52.857573553+02:00"
+    appVersion: 1.10.1
+    created: "2024-08-21T18:55:36.516518177+02:00"
     description: Postgres Operator UI provides a graphical interface for a convenient
       database-as-a-service user experience
-    digest: df434af6c8b697fe0631017ecc25e3c79e125361ae6622347cea41a545153bdc
+    digest: 2e5e7a82aebee519ec57c6243eb8735124aa4585a3a19c66ffd69638fbeb11ce
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -91,14 +91,14 @@ entries:
     sources:
     - https://github.com/zalando/postgres-operator
     urls:
-    - postgres-operator-ui-1.9.0.tgz
-    version: 1.9.0
+    - postgres-operator-ui-1.10.1.tgz
+    version: 1.10.1
   - apiVersion: v2
-    appVersion: 1.8.2
-    created: "2024-06-14T10:31:52.855335455+02:00"
+    appVersion: 1.9.0
+    created: "2024-08-21T18:55:36.52712908+02:00"
     description: Postgres Operator UI provides a graphical interface for a convenient
       database-as-a-service user experience
-    digest: fbfc90fa8fd007a08a7c02e0ec9108bb8282cbb42b8c976d88f2193d6edff30c
+    digest: df434af6c8b697fe0631017ecc25e3c79e125361ae6622347cea41a545153bdc
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -114,6 +114,6 @@ entries:
     sources:
     - https://github.com/zalando/postgres-operator
     urls:
-    - postgres-operator-ui-1.8.2.tgz
-    version: 1.8.2
-generated: "2024-06-14T10:31:52.839113675+02:00"
+    - postgres-operator-ui-1.9.0.tgz
+    version: 1.9.0
+generated: "2024-08-21T18:55:36.512456099+02:00"

charts/postgres-operator-ui/values.yaml

@@ -8,7 +8,7 @@ replicaCount: 1
 image:
   registry: ghcr.io
   repository: zalando/postgres-operator-ui
-  tag: v1.12.2
+  tag: v1.13.0
   pullPolicy: "IfNotPresent"
 
 # Optionally specify an array of imagePullSecrets.

charts/postgres-operator/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: postgres-operator
-version: 1.12.2
-appVersion: 1.12.2
+version: 1.13.0
+appVersion: 1.13.0
 home: https://github.com/zalando/postgres-operator
 description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
 keywords:

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -160,7 +160,7 @@ spec:
                 properties:
                   major_version_upgrade_mode:
                     type: string
-                    default: "off"
+                    default: "manual"
                   major_version_upgrade_team_allow_list:
                     type: array
                     items:
@@ -472,7 +472,6 @@ spec:
                     type: string
                   additional_secret_mount_path:
                     type: string
-                    default: "/meta/credentials"
                   aws_region:
                     type: string
                     default: "eu-central-1"
@@ -511,7 +510,7 @@ spec:
                     pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
                   logical_backup_docker_image:
                     type: string
-                    default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.2"
+                    default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.13.0"
                   logical_backup_google_application_credentials:
                     type: string
                   logical_backup_job_prefix:

charts/postgres-operator/crds/postgresqls.yaml

@@ -226,7 +226,7 @@ spec:
                 type: array
                 items:
                   type: string
-                  pattern: '^\ *((Mon|Tue|Wed|Thu|Fri|Sat|Sun):(2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))-((Mon|Tue|Wed|Thu|Fri|Sat|Sun):(2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))\ *$'
+                  pattern: '^\ *((Mon|Tue|Wed|Thu|Fri|Sat|Sun):(2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))-((2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))\ *$'
               masterServiceAnnotations:
                 type: object
                 additionalProperties:

charts/postgres-operator/index.yaml

@@ -2,11 +2,11 @@ apiVersion: v1
 entries:
   postgres-operator:
   - apiVersion: v2
-    appVersion: 1.12.2
-    created: "2024-06-14T10:30:44.071387784+02:00"
+    appVersion: 1.13.0
+    created: "2024-08-21T18:54:43.160735116+02:00"
     description: Postgres Operator creates and manages PostgreSQL clusters running
       in Kubernetes
-    digest: 65858d14a40d7fd90c32bd9fc60021acc9555c161079f43a365c70171eaf21d8
+    digest: a839601689aea0a7e6bc0712a5244d435683cf3314c95794097ff08540e1dfef
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -21,14 +21,14 @@ entries:
     sources:
     - https://github.com/zalando/postgres-operator
     urls:
-    - postgres-operator-1.12.2.tgz
-    version: 1.12.2
+    - postgres-operator-1.13.0.tgz
+    version: 1.13.0
   - apiVersion: v2
-    appVersion: 1.11.0
-    created: "2024-06-14T10:30:44.065353504+02:00"
+    appVersion: 1.12.2
+    created: "2024-08-21T18:54:43.152249286+02:00"
     description: Postgres Operator creates and manages PostgreSQL clusters running
       in Kubernetes
-    digest: 3914b5e117bda0834f05c9207f007e2ac372864cf6e86dcc2e1362bbe46c14d9
+    digest: 65858d14a40d7fd90c32bd9fc60021acc9555c161079f43a365c70171eaf21d8
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -43,14 +43,14 @@ entries:
     sources:
     - https://github.com/zalando/postgres-operator
     urls:
-    - postgres-operator-1.11.0.tgz
-    version: 1.11.0
+    - postgres-operator-1.12.2.tgz
+    version: 1.12.2
   - apiVersion: v2
-    appVersion: 1.10.1
-    created: "2024-06-14T10:30:44.059080224+02:00"
+    appVersion: 1.11.0
+    created: "2024-08-21T18:54:43.145837894+02:00"
     description: Postgres Operator creates and manages PostgreSQL clusters running
       in Kubernetes
-    digest: cc3baa41753da92466223d0b334df27e79c882296577b404a8e9071411fcf19c
+    digest: 3914b5e117bda0834f05c9207f007e2ac372864cf6e86dcc2e1362bbe46c14d9
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -65,14 +65,14 @@ entries:
     sources:
     - https://github.com/zalando/postgres-operator
     urls:
-    - postgres-operator-1.10.1.tgz
-    version: 1.10.1
+    - postgres-operator-1.11.0.tgz
+    version: 1.11.0
   - apiVersion: v2
-    appVersion: 1.9.0
-    created: "2024-06-14T10:30:44.084760658+02:00"
+    appVersion: 1.10.1
+    created: "2024-08-21T18:54:43.139552116+02:00"
     description: Postgres Operator creates and manages PostgreSQL clusters running
       in Kubernetes
-    digest: 64df90c898ca591eb3a330328173ffaadfbf9ddd474d8c42ed143edc9e3f4276
+    digest: cc3baa41753da92466223d0b334df27e79c882296577b404a8e9071411fcf19c
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -87,14 +87,14 @@ entries:
     sources:
     - https://github.com/zalando/postgres-operator
     urls:
-    - postgres-operator-1.9.0.tgz
-    version: 1.9.0
+    - postgres-operator-1.10.1.tgz
+    version: 1.10.1
   - apiVersion: v2
-    appVersion: 1.8.2
-    created: "2024-06-14T10:30:44.077744166+02:00"
+    appVersion: 1.9.0
+    created: "2024-08-21T18:54:43.168490032+02:00"
     description: Postgres Operator creates and manages PostgreSQL clusters running
       in Kubernetes
-    digest: f77ffad2e98b72a621e5527015cf607935d3ed688f10ba4b626435acb9631b5b
+    digest: 64df90c898ca591eb3a330328173ffaadfbf9ddd474d8c42ed143edc9e3f4276
     home: https://github.com/zalando/postgres-operator
     keywords:
     - postgres
@@ -109,6 +109,6 @@ entries:
     sources:
     - https://github.com/zalando/postgres-operator
     urls:
-    - postgres-operator-1.8.2.tgz
-    version: 1.8.2
-generated: "2024-06-14T10:30:44.052436544+02:00"
+    - postgres-operator-1.9.0.tgz
+    version: 1.9.0
+generated: "2024-08-21T18:54:43.126871802+02:00"

charts/postgres-operator/values.yaml

@@ -1,7 +1,7 @@
 image:
   registry: ghcr.io
   repository: zalando/postgres-operator
-  tag: v1.12.2
+  tag: v1.13.0
   pullPolicy: "IfNotPresent"
 
 # Optionally specify an array of imagePullSecrets.
@@ -83,7 +83,7 @@ configUsers:
 
 configMajorVersionUpgrade:
   # "off": no upgrade, "manual": manifest triggers action, "full": minimal version violation triggers too
-  major_version_upgrade_mode: "off"
+  major_version_upgrade_mode: "manual"
   # upgrades will only be carried out for clusters of listed teams when mode is "off"
   # major_version_upgrade_team_allow_list:
   # - acid
@@ -364,7 +364,7 @@ configLogicalBackup:
   # logical_backup_memory_request: ""
 
   # image for pods of the logical backup job (example runs pg_dumpall)
-  logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.2"
+  logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.13.0"
   # path of google cloud service account json file
   # logical_backup_google_application_credentials: ""
 

docs/administrator.md

@@ -70,7 +70,7 @@ the manifest. Still, a rolling update would be triggered updating the
 script will notice the version mismatch and start the old version again.
 
 In this scenario the major version could then be run by a user from within the
-master pod. Exec into the container and run:
+primary pod. Exec into the container and run:
 ```bash
 python3 /scripts/inplace_upgrade.py N
 ```
@@ -81,6 +81,9 @@ upgrade procedure, refer to the [corresponding PR in Spilo](https://github.com/z
 
 When `major_version_upgrade_mode` is set to `manual` the operator will run
 the upgrade script for you after the manifest is updated and pods are rotated.
+It is also possible to define `maintenanceWindows` in the Postgres manifest to
+better control when such automated upgrades should take place after increasing
+the version.
 
 ### Upgrade annotations
 
@@ -1458,7 +1461,7 @@ make docker
 
 # build in image in minikube docker env
 eval $(minikube docker-env)
-docker build -t ghcr.io/zalando/postgres-operator-ui:v1.12.2 .
+docker build -t ghcr.io/zalando/postgres-operator-ui:v1.13.0 .
 
 # apply UI manifests next to a running Postgres Operator
 kubectl apply -f manifests/

docs/reference/cluster_manifest.md

@@ -115,9 +115,9 @@ These parameters are grouped directly under  the `spec` key in the manifest.
   inaccessible from outside of the Kubernetes cluster.
 
 * **maintenanceWindows**
-  a list defines specific time frames when major version upgrades are permitted
-  to occur, restricting major version upgrades to these designated periods only.
-  Accepted formats include "01:00-06:00" for daily maintenance windows or 
+  a list which defines specific time frames when certain maintenance operations
+  are allowed. So far, it is only implemented for automatic major version
+  upgrades. Accepted formats are "01:00-06:00" for daily maintenance windows or 
   "Sat:00:00-04:00" for specific days, with all times in UTC.
 
 * **users**

docs/reference/operator_parameters.md

@@ -242,7 +242,7 @@ CRD-configuration, they are grouped under the `major_version_upgrade` key.
   `"manual"` = manifest triggers action,
   `"full"` = manifest and minimal version violation trigger upgrade.
   Note, that with all three modes increasing the version in the manifest will
-  trigger a rolling update of the pods. The default is `"off"`.
+  trigger a rolling update of the pods. The default is `"manual"`.
 
 * **major_version_upgrade_team_allow_list**
   Upgrades will only be carried out for clusters of listed teams when mode is
@@ -822,7 +822,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 `/<configured-s3-bucket-prefix>/<pg_cluster_name>/<cluster_k8s_uuid>/logical_backups`.
   The default image is the same image built with the Zalando-internal CI
-  pipeline. Default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.2"
+  pipeline. Default: "ghcr.io/zalando/postgres-operator/logical-backup:v1.13.0"
 
 * **logical_backup_google_application_credentials**
   Specifies the path of the google cloud service account json file. Default is empty.