From 99ba3088dac9d2b2c6829295df32021e8567027f Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Wed, 14 Aug 2024 14:09:51 +0200 Subject: [PATCH 1/4] bump operator to v1.13.0 --- .../postgres-operator-issue-template.md | 2 +- Makefile | 2 +- README.md | 6 +- charts/postgres-operator-ui/Chart.yaml | 4 +- charts/postgres-operator-ui/index.yaml | 52 +++++++------- .../postgres-operator-ui-1.13.0.tgz | Bin 0 -> 5081 bytes .../postgres-operator-ui-1.8.2.tgz | Bin 4976 -> 0 bytes charts/postgres-operator-ui/values.yaml | 2 +- charts/postgres-operator/Chart.yaml | 4 +- .../crds/operatorconfigurations.yaml | 2 +- charts/postgres-operator/index.yaml | 52 +++++++------- .../postgres-operator-1.13.0.tgz | Bin 0 -> 18158 bytes .../postgres-operator-1.8.2.tgz | Bin 16731 -> 0 bytes charts/postgres-operator/values.yaml | 4 +- docs/administrator.md | 7 +- docs/reference/cluster_manifest.md | 6 +- docs/reference/operator_parameters.md | 2 +- docs/user.md | 2 +- e2e/Makefile | 2 +- go.mod | 23 +++--- go.sum | 48 ++++++------- kubectl-pg/go.mod | 20 +++--- kubectl-pg/go.sum | 66 +++++++++++------- manifests/configmap.yaml | 2 +- manifests/operatorconfiguration.crd.yaml | 2 +- manifests/postgres-operator.yaml | 2 +- ...gresql-operator-default-configuration.yaml | 2 +- pkg/controller/operator_config.go | 2 +- pkg/util/config/config.go | 2 +- ui/app/package.json | 2 +- ui/manifests/deployment.yaml | 2 +- 31 files changed, 171 insertions(+), 151 deletions(-) create mode 100644 charts/postgres-operator-ui/postgres-operator-ui-1.13.0.tgz delete mode 100644 charts/postgres-operator-ui/postgres-operator-ui-1.8.2.tgz create mode 100644 charts/postgres-operator/postgres-operator-1.13.0.tgz delete mode 100644 charts/postgres-operator/postgres-operator-1.8.2.tgz diff --git a/.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md b/.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md index 3a0e52bf5..ee3a704ea 100644 --- 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. 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.] diff --git a/Makefile b/Makefile index 56c63cd75..3b7ae4ede 100644 --- a/Makefile +++ b/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.28.12 GO111MODULE=on go install github.com/golang/mock/mockgen@v1.6.0 GO111MODULE=on go mod tidy diff --git a/README.md b/README.md index 2e46c6339..c34bc6f6f 100644 --- a/README.md +++ b/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 diff --git a/charts/postgres-operator-ui/Chart.yaml b/charts/postgres-operator-ui/Chart.yaml index 1bb27c741..1d5597940 100644 --- a/charts/postgres-operator-ui/Chart.yaml +++ b/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: diff --git a/charts/postgres-operator-ui/index.yaml b/charts/postgres-operator-ui/index.yaml index 90e3a7f0a..ccd203a4c 100644 --- a/charts/postgres-operator-ui/index.yaml +++ b/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-14T14:02:17.144914554+02:00" description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience - digest: cbcef400c23ccece27d97369ad629278265c013e0a45c0b7f33e7568a082fedd + digest: 5a14bbe8e7201ed1e24ef3d8239819342dad732d548f46f7d941a31ebf88abd7 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-14T14:02:17.144354843+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-14T14:02:17.143700797+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-14T14:02:17.143111215+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-14T14:02:17.145472028+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-14T14:02:17.142392976+02:00" diff --git a/charts/postgres-operator-ui/postgres-operator-ui-1.13.0.tgz b/charts/postgres-operator-ui/postgres-operator-ui-1.13.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..d6e146177bc87713f27b7d229e5127b72b54bab0 GIT binary patch literal 5081 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 diff --git a/charts/postgres-operator-ui/values.yaml b/charts/postgres-operator-ui/values.yaml index 2342496c5..22f787826 100644 --- a/charts/postgres-operator-ui/values.yaml +++ b/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. diff --git a/charts/postgres-operator/Chart.yaml b/charts/postgres-operator/Chart.yaml index 38c2e6da8..ae4723b0e 100644 --- a/charts/postgres-operator/Chart.yaml +++ b/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: diff --git a/charts/postgres-operator/crds/operatorconfigurations.yaml b/charts/postgres-operator/crds/operatorconfigurations.yaml index 15783fd38..e098264bd 100644 --- a/charts/postgres-operator/crds/operatorconfigurations.yaml +++ b/charts/postgres-operator/crds/operatorconfigurations.yaml @@ -511,7 +511,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: diff --git a/charts/postgres-operator/index.yaml b/charts/postgres-operator/index.yaml index 63a9d732c..047d9eb74 100644 --- a/charts/postgres-operator/index.yaml +++ b/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-14T14:01:24.925088044+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes - digest: 65858d14a40d7fd90c32bd9fc60021acc9555c161079f43a365c70171eaf21d8 + digest: 69a21a58741d68fb41da5de3ab3ffc510a22917808e3ccabd87725ce2fe836f8 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-14T14:01:24.922871695+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-14T14:01:24.920660291+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-14T14:01:24.918849768+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-14T14:01:24.927677088+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-14T14:01:24.916933098+02:00" diff --git a/charts/postgres-operator/postgres-operator-1.13.0.tgz b/charts/postgres-operator/postgres-operator-1.13.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..12a13b7cea40ce036962bb98c2d4c38753252ae8 GIT binary patch literal 18158 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 literal 0 HcmV?d00001 diff --git a/charts/postgres-operator/postgres-operator-1.8.2.tgz b/charts/postgres-operator/postgres-operator-1.8.2.tgz deleted file mode 100644 index 61f0f8aeeba7cb4cf99e562c617a6c37362ab024..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16731 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 C|7>Ug diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index c208ff556..d667816fb 100644 --- a/charts/postgres-operator/values.yaml +++ b/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. @@ -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: "" diff --git a/docs/administrator.md b/docs/administrator.md index d2b8e7039..3552f958b 100644 --- a/docs/administrator.md +++ b/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. ## Non-default cluster domain @@ -1452,7 +1455,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/ diff --git a/docs/reference/cluster_manifest.md b/docs/reference/cluster_manifest.md index c09cc6988..bf731be2e 100644 --- a/docs/reference/cluster_manifest.md +++ b/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** diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md index 83259c287..76ccf40da 100644 --- a/docs/reference/operator_parameters.md +++ b/docs/reference/operator_parameters.md @@ -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 `////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. diff --git a/docs/user.md b/docs/user.md index 056df7065..78b30dfe9 100644 --- a/docs/user.md +++ b/docs/user.md @@ -758,7 +758,7 @@ If you need to define a `nodeAffinity` for all your Postgres clusters use the ## In-place major version upgrade Starting with Spilo 13, operator supports in-place major version upgrade to a -higher major version (e.g. from PG 11 to PG 13). To trigger the upgrade, +higher major version (e.g. from PG 14 to PG 16). To trigger the upgrade, simply increase the version in the manifest. It is your responsibility to test your applications against the new version before the upgrade; downgrading is not supported. The easiest way to do so is to try the upgrade on the cloned diff --git a/e2e/Makefile b/e2e/Makefile index 9d3681ce5..8e200dab1 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -46,7 +46,7 @@ tools: # install pinned version of 'kind' # go install must run outside of a dir with a (module-based) Go project ! # otherwise go install updates project's dependencies and/or behaves differently - cd "/tmp" && GO111MODULE=on go install sigs.k8s.io/kind@v0.22.0 + cd "/tmp" && GO111MODULE=on go install sigs.k8s.io/kind@v0.23.0 e2etest: tools copy clean ./run.sh main diff --git a/go.mod b/go.mod index efa66be36..c1b36d6a5 100644 --- a/go.mod +++ b/go.mod @@ -11,13 +11,13 @@ require ( github.com/r3labs/diff v1.1.0 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 - golang.org/x/crypto v0.23.0 + golang.org/x/crypto v0.26.0 golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.28.10 + k8s.io/api v0.28.12 k8s.io/apiextensions-apiserver v0.25.9 - k8s.io/apimachinery v0.28.10 - k8s.io/client-go v0.28.10 + k8s.io/apimachinery v0.28.12 + k8s.io/client-go v0.28.12 k8s.io/code-generator v0.25.9 ) @@ -33,7 +33,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/imdario/mergo v0.3.6 // indirect @@ -48,14 +48,15 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/net v0.25.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/term v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.23.0 // indirect + golang.org/x/term v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 72f94a1ad..f882a95bd 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6 github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= @@ -113,31 +113,31 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -145,16 +145,16 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU= +golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -163,8 +163,8 @@ golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -186,14 +186,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.10 h1:q1Y+h3F+siuwP/qCQuqgqGJjaIuQWN0yFE7z367E3Q0= -k8s.io/api v0.28.10/go.mod h1:u6EzGdzmEC2vfhyw4sD89i7OIc/2v1EAwvd1t4chQac= +k8s.io/api v0.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ= +k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ= k8s.io/apiextensions-apiserver v0.25.9 h1:Pycd6lm2auABp9wKQHCFSEPG+NPdFSTJXPST6NJFzB8= k8s.io/apiextensions-apiserver v0.25.9/go.mod h1:ijGxmSG1GLOEaWhTuaEr0M7KUeia3mWCZa6FFQqpt1M= -k8s.io/apimachinery v0.28.10 h1:cWonrYsJK3lbuf9IgMs5+L5Jzw6QR3ZGA3hzwG0HDeI= -k8s.io/apimachinery v0.28.10/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= -k8s.io/client-go v0.28.10 h1:y+mvUei3+RU0rE7r2BZFA2ApTAsXSN1glGs4QfULLt4= -k8s.io/client-go v0.28.10/go.mod h1:JLwjCWhQhvm1F4J+7YAr9WVhSRNmfkRofPWU43m8LZk= +k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0= +k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= +k8s.io/client-go v0.28.12 h1:li7iRPRQF3vDki6gTxT/kXWJvw3BkJSdjVPVhDTZQec= +k8s.io/client-go v0.28.12/go.mod h1:yEzH2Z+nEGlrnKyHJWcJsbOr5tGdIj04dj1TVQOg0wE= k8s.io/code-generator v0.25.9 h1:lgyAV9AIRYNxZxgLRXqsCAtqJLHvakot41CjEqD5W0w= k8s.io/code-generator v0.25.9/go.mod h1:DHfpdhSUrwqF0f4oLqCtF8gYbqlndNetjBEz45nWzJI= k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08= diff --git a/kubectl-pg/go.mod b/kubectl-pg/go.mod index fb32e08c4..6a658eb49 100644 --- a/kubectl-pg/go.mod +++ b/kubectl-pg/go.mod @@ -3,20 +3,20 @@ module github.com/zalando/postgres-operator/kubectl-pg go 1.22 require ( - github.com/spf13/cobra v1.8.0 - github.com/spf13/viper v1.18.2 - github.com/zalando/postgres-operator v1.12.0 - k8s.io/api v0.28.10 + github.com/spf13/cobra v1.8.1 + github.com/spf13/viper v1.19.0 + github.com/zalando/postgres-operator v1.12.2 + k8s.io/api v0.28.12 k8s.io/apiextensions-apiserver v0.25.9 - k8s.io/apimachinery v0.28.10 - k8s.io/client-go v0.28.10 + k8s.io/apimachinery v0.28.12 + k8s.io/client-go v0.28.12 ) require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-logr/logr v1.2.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect github.com/go-openapi/jsonpointer v0.19.6 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect github.com/go-openapi/swag v0.22.3 // indirect @@ -40,7 +40,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect @@ -53,12 +53,12 @@ require ( golang.org/x/crypto v0.23.0 // indirect golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect golang.org/x/net v0.23.0 // indirect - golang.org/x/oauth2 v0.15.0 // indirect + golang.org/x/oauth2 v0.18.0 // indirect golang.org/x/sys v0.20.0 // indirect golang.org/x/term v0.20.0 // indirect golang.org/x/text v0.15.0 // indirect golang.org/x/time v0.5.0 // indirect - google.golang.org/appengine v1.6.7 // indirect + google.golang.org/appengine v1.6.8 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/kubectl-pg/go.sum b/kubectl-pg/go.sum index d42bafcc5..5d8a2a57f 100644 --- a/kubectl-pg/go.sum +++ b/kubectl-pg/go.sum @@ -1,6 +1,6 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -13,8 +13,8 @@ github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7z github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= @@ -25,11 +25,13 @@ github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEe github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -80,8 +82,8 @@ github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE= github.com/onsi/ginkgo/v2 v2.9.4/go.mod h1:gCQYp2Q+kSoIj7ykSVb9nskRSsR6PUj4AiLywzIhbKM= github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -100,15 +102,16 @@ github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= -github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= +github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= +github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -121,42 +124,54 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/zalando/postgres-operator v1.12.0 h1:9C5u8UgrVQDRdzB3/T7kKWYKEf2vbF9EZHqtCRSgJtE= -github.com/zalando/postgres-operator v1.12.0/go.mod h1:tKNY4pMjnr5BhuzGiGngf1SPJ7K1vVRCmMkfmV9KZoQ= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +github.com/zalando/postgres-operator v1.12.2 h1:HJLrGSJLKYkvdpHIxlAKhXWTeRsgDQki2s9QOyApUX0= +github.com/zalando/postgres-operator v1.12.2/go.mod h1:tKNY4pMjnr5BhuzGiGngf1SPJ7K1vVRCmMkfmV9KZoQ= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/oauth2 v0.15.0 h1:s8pnnxNVzjWyrvYdFUQq5llS1PX2zhPXmccZv99h7uQ= -golang.org/x/oauth2 v0.15.0/go.mod h1:q48ptWNTY5XWf+JNten23lcvHpLJ0ZSxF5ttTHKVCAM= +golang.org/x/oauth2 v0.18.0 h1:09qnuIAgzdx1XplqJvW6CQqMCtGZykZWcXzPMPUusvI= +golang.org/x/oauth2 v0.18.0/go.mod h1:Wf7knwG0MPoWIMMBgFlEaSUDaKskp0dCfrlJRJXbBi8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -165,14 +180,17 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -188,14 +206,14 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.10 h1:q1Y+h3F+siuwP/qCQuqgqGJjaIuQWN0yFE7z367E3Q0= -k8s.io/api v0.28.10/go.mod h1:u6EzGdzmEC2vfhyw4sD89i7OIc/2v1EAwvd1t4chQac= +k8s.io/api v0.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ= +k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ= k8s.io/apiextensions-apiserver v0.25.9 h1:Pycd6lm2auABp9wKQHCFSEPG+NPdFSTJXPST6NJFzB8= k8s.io/apiextensions-apiserver v0.25.9/go.mod h1:ijGxmSG1GLOEaWhTuaEr0M7KUeia3mWCZa6FFQqpt1M= -k8s.io/apimachinery v0.28.10 h1:cWonrYsJK3lbuf9IgMs5+L5Jzw6QR3ZGA3hzwG0HDeI= -k8s.io/apimachinery v0.28.10/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= -k8s.io/client-go v0.28.10 h1:y+mvUei3+RU0rE7r2BZFA2ApTAsXSN1glGs4QfULLt4= -k8s.io/client-go v0.28.10/go.mod h1:JLwjCWhQhvm1F4J+7YAr9WVhSRNmfkRofPWU43m8LZk= +k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0= +k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= +k8s.io/client-go v0.28.12 h1:li7iRPRQF3vDki6gTxT/kXWJvw3BkJSdjVPVhDTZQec= +k8s.io/client-go v0.28.12/go.mod h1:yEzH2Z+nEGlrnKyHJWcJsbOr5tGdIj04dj1TVQOg0wE= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index 285e23379..06497b75e 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -84,7 +84,7 @@ data: # logical_backup_azure_storage_account_key: "" # logical_backup_cpu_limit: "" # logical_backup_cpu_request: "" - 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" # logical_backup_google_application_credentials: "" logical_backup_job_prefix: "logical-backup-" # logical_backup_memory_limit: "" diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml index fbd462e9e..e0e37dde9 100644 --- a/manifests/operatorconfiguration.crd.yaml +++ b/manifests/operatorconfiguration.crd.yaml @@ -509,7 +509,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: diff --git a/manifests/postgres-operator.yaml b/manifests/postgres-operator.yaml index d0890bd34..fbba84c7f 100644 --- a/manifests/postgres-operator.yaml +++ b/manifests/postgres-operator.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: postgres-operator containers: - name: postgres-operator - image: ghcr.io/zalando/postgres-operator:v1.12.2 + image: ghcr.io/zalando/postgres-operator:v1.13.0 imagePullPolicy: IfNotPresent resources: requests: diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index 11dd4619f..68273cadc 100644 --- a/manifests/postgresql-operator-default-configuration.yaml +++ b/manifests/postgresql-operator-default-configuration.yaml @@ -168,7 +168,7 @@ configuration: # logical_backup_cpu_request: "" # logical_backup_memory_limit: "" # logical_backup_memory_request: "" - 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" # logical_backup_google_application_credentials: "" logical_backup_job_prefix: "logical-backup-" logical_backup_provider: "s3" diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go index 16e3a9ae7..26d25ebca 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -180,7 +180,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur // logical backup config result.LogicalBackupSchedule = util.Coalesce(fromCRD.LogicalBackup.Schedule, "30 00 * * *") - result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "ghcr.io/zalando/postgres-operator/logical-backup:v1.12.2") + result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "ghcr.io/zalando/postgres-operator/logical-backup:v1.13.0") result.LogicalBackupProvider = util.Coalesce(fromCRD.LogicalBackup.BackupProvider, "s3") result.LogicalBackupAzureStorageAccountName = fromCRD.LogicalBackup.AzureStorageAccountName result.LogicalBackupAzureStorageAccountKey = fromCRD.LogicalBackup.AzureStorageAccountKey diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index cac844bf0..58c0e0de9 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -127,7 +127,7 @@ type Scalyr struct { // LogicalBackup defines configuration for logical backup type LogicalBackup struct { LogicalBackupSchedule string `name:"logical_backup_schedule" default:"30 00 * * *"` - LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"ghcr.io/zalando/postgres-operator/logical-backup:v1.12.2"` + LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"ghcr.io/zalando/postgres-operator/logical-backup:v1.13.0"` LogicalBackupProvider string `name:"logical_backup_provider" default:"s3"` LogicalBackupAzureStorageAccountName string `name:"logical_backup_azure_storage_account_name" default:""` LogicalBackupAzureStorageContainer string `name:"logical_backup_azure_storage_container" default:""` diff --git a/ui/app/package.json b/ui/app/package.json index 076aa7875..e96ee77dc 100644 --- a/ui/app/package.json +++ b/ui/app/package.json @@ -1,6 +1,6 @@ { "name": "postgres-operator-ui", - "version": "1.12.2", + "version": "1.13.0", "description": "PostgreSQL Operator UI", "main": "src/app.js", "config": { diff --git a/ui/manifests/deployment.yaml b/ui/manifests/deployment.yaml index f5ca17da9..76d2143cb 100644 --- a/ui/manifests/deployment.yaml +++ b/ui/manifests/deployment.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: postgres-operator-ui containers: - name: "service" - image: ghcr.io/zalando/postgres-operator-ui:v1.12.2 + image: ghcr.io/zalando/postgres-operator-ui:v1.13.0 ports: - containerPort: 8081 protocol: "TCP" From 4e0e8be1e233639bc1b01856d4a34419bdbab902 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Wed, 21 Aug 2024 18:56:49 +0200 Subject: [PATCH 2/4] align configmap with CRD config --- charts/postgres-operator-ui/index.yaml | 14 +-- .../postgres-operator-ui-1.13.0.tgz | Bin 5081 -> 5074 bytes .../crds/operatorconfigurations.yaml | 3 +- charts/postgres-operator/index.yaml | 14 +-- .../postgres-operator-1.13.0.tgz | Bin 18158 -> 18151 bytes charts/postgres-operator/values.yaml | 2 +- docs/reference/operator_parameters.md | 2 +- manifests/configmap.yaml | 105 +++++++++--------- manifests/operatorconfiguration.crd.yaml | 3 +- manifests/postgres-operator.yaml | 2 +- ...gresql-operator-default-configuration.yaml | 2 +- .../v1/operator_configuration_type.go | 4 +- pkg/controller/operator_config.go | 4 +- pkg/util/config/config.go | 4 +- 14 files changed, 78 insertions(+), 81 deletions(-) diff --git a/charts/postgres-operator-ui/index.yaml b/charts/postgres-operator-ui/index.yaml index ccd203a4c..1b89eeb60 100644 --- a/charts/postgres-operator-ui/index.yaml +++ b/charts/postgres-operator-ui/index.yaml @@ -3,10 +3,10 @@ entries: postgres-operator-ui: - apiVersion: v2 appVersion: 1.13.0 - created: "2024-08-14T14:02:17.144914554+02:00" + 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: 5a14bbe8e7201ed1e24ef3d8239819342dad732d548f46f7d941a31ebf88abd7 + digest: e0444e516b50f82002d1a733527813c51759a627cefdd1005cea73659f824ea8 home: https://github.com/zalando/postgres-operator keywords: - postgres @@ -26,7 +26,7 @@ entries: version: 1.13.0 - apiVersion: v2 appVersion: 1.12.2 - created: "2024-08-14T14:02:17.144354843+02:00" + 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: cbcef400c23ccece27d97369ad629278265c013e0a45c0b7f33e7568a082fedd @@ -49,7 +49,7 @@ entries: version: 1.12.2 - apiVersion: v2 appVersion: 1.11.0 - created: "2024-08-14T14:02:17.143700797+02:00" + 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: a45f2284045c2a9a79750a36997386444f39b01ac722b17c84b431457577a3a2 @@ -72,7 +72,7 @@ entries: version: 1.11.0 - apiVersion: v2 appVersion: 1.10.1 - created: "2024-08-14T14:02:17.143111215+02:00" + 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: 2e5e7a82aebee519ec57c6243eb8735124aa4585a3a19c66ffd69638fbeb11ce @@ -95,7 +95,7 @@ entries: version: 1.10.1 - apiVersion: v2 appVersion: 1.9.0 - created: "2024-08-14T14:02:17.145472028+02:00" + 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: df434af6c8b697fe0631017ecc25e3c79e125361ae6622347cea41a545153bdc @@ -116,4 +116,4 @@ entries: urls: - postgres-operator-ui-1.9.0.tgz version: 1.9.0 -generated: "2024-08-14T14:02:17.142392976+02:00" +generated: "2024-08-21T18:55:36.512456099+02:00" diff --git a/charts/postgres-operator-ui/postgres-operator-ui-1.13.0.tgz b/charts/postgres-operator-ui/postgres-operator-ui-1.13.0.tgz index d6e146177bc87713f27b7d229e5127b72b54bab0..21aadc0767b2af775e2142dcd83566a3b67fd172 100644 GIT binary patch delta 4729 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 diff --git a/charts/postgres-operator/crds/operatorconfigurations.yaml b/charts/postgres-operator/crds/operatorconfigurations.yaml index e098264bd..5edb7044f 100644 --- a/charts/postgres-operator/crds/operatorconfigurations.yaml +++ b/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" diff --git a/charts/postgres-operator/index.yaml b/charts/postgres-operator/index.yaml index 047d9eb74..c72604daa 100644 --- a/charts/postgres-operator/index.yaml +++ b/charts/postgres-operator/index.yaml @@ -3,10 +3,10 @@ entries: postgres-operator: - apiVersion: v2 appVersion: 1.13.0 - created: "2024-08-14T14:01:24.925088044+02:00" + created: "2024-08-21T18:54:43.160735116+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes - digest: 69a21a58741d68fb41da5de3ab3ffc510a22917808e3ccabd87725ce2fe836f8 + digest: a839601689aea0a7e6bc0712a5244d435683cf3314c95794097ff08540e1dfef home: https://github.com/zalando/postgres-operator keywords: - postgres @@ -25,7 +25,7 @@ entries: version: 1.13.0 - apiVersion: v2 appVersion: 1.12.2 - created: "2024-08-14T14:01:24.922871695+02:00" + created: "2024-08-21T18:54:43.152249286+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: 65858d14a40d7fd90c32bd9fc60021acc9555c161079f43a365c70171eaf21d8 @@ -47,7 +47,7 @@ entries: version: 1.12.2 - apiVersion: v2 appVersion: 1.11.0 - created: "2024-08-14T14:01:24.920660291+02:00" + created: "2024-08-21T18:54:43.145837894+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: 3914b5e117bda0834f05c9207f007e2ac372864cf6e86dcc2e1362bbe46c14d9 @@ -69,7 +69,7 @@ entries: version: 1.11.0 - apiVersion: v2 appVersion: 1.10.1 - created: "2024-08-14T14:01:24.918849768+02:00" + created: "2024-08-21T18:54:43.139552116+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: cc3baa41753da92466223d0b334df27e79c882296577b404a8e9071411fcf19c @@ -91,7 +91,7 @@ entries: version: 1.10.1 - apiVersion: v2 appVersion: 1.9.0 - created: "2024-08-14T14:01:24.927677088+02:00" + created: "2024-08-21T18:54:43.168490032+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: 64df90c898ca591eb3a330328173ffaadfbf9ddd474d8c42ed143edc9e3f4276 @@ -111,4 +111,4 @@ entries: urls: - postgres-operator-1.9.0.tgz version: 1.9.0 -generated: "2024-08-14T14:01:24.916933098+02:00" +generated: "2024-08-21T18:54:43.126871802+02:00" diff --git a/charts/postgres-operator/postgres-operator-1.13.0.tgz b/charts/postgres-operator/postgres-operator-1.13.0.tgz index 12a13b7cea40ce036962bb98c2d4c38753252ae8..3d7ca4ce6455adfcaf7f0718f1efdc8e7604c7af 100644 GIT binary patch literal 18151 zcmV)dK&QVSiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PMYccjGqlDERwZp8~6%d!{>S%6j}TJD0ziTkNy(CI_uMgaPDdtzssd0bR22$^n2BVGb(X8LXah(0x>+}YlZp$aa<1|j--GycsbgtP2 zd7R*c2!taag*d_!B21~P|M?zyK`Ii$1>$KG(P)Bb)I#XzbVPVW5+Yht7Lp;FCP^%Y zJ3AAaOw&=vW8uyx9N@@jI}04zx*_vh#(gntImmo%IVk(?ATMC4??gDEGa?J>LgY z93)~IuvUm^lwcYW4lqcFX)u)aBf(Pck^io7cYM-9D8iD$|D|5F)L)B4shR-qUX7WR zy8DsGe{ufLaF7zQO##q6|M&Xc{e#l{-|Ox5p6CB#JT$};GHfBl$%Kl8&xdF-^>~Le zco#E46DHr*b1*^)o($1UGcZDN8Uzy$&q6Eb0(5`oglCmh{QsW(L)_l3bSA}F9DA$|+V_ikQA(&nHx4uUoS z)r7Dpm;*H;!3i0sfsmYYOOq)}6GX$1_!K83m?NLbK9fZ`3j+CDfykQ>;7@ZGmJBzI zCmj34^dz)`BvAX}-7hDXSEuJ^h(t3q!yM5_Bn11Cony{s)HjHr+_|U0s~MKX;GM&we_6_wn-R`tB)^-&%yK9YXLANvrkeElF8rMvlxSbNN z=DTXR8exYm(^TV#zsmK&zJKeA|6Z%k#Ie!(1lVUI_M;f zlQ~KS5$NYbp*0Nj_V}tJu_d1GPMMICR`I0j0-t#|gsWa?A^oSTB(IUSnT7y;%5e65+#9@YPXEvNF^T~%C#?F<&ZLJMsj{<LwX?1U820t(&CPs7$cZ%uOS;ZB@oqHHX=<7%&e9C6Z78<_p3?&`G2Oq!if( z4;%eKJXpUBR8>Jzj--S!GjymuG|*YHNC9Ntod%*kJMA^X!UWnLz{=X-$am!?mFcMZhz0OH>4G$4GQgHriq+gAe=ya0HK_yn4sbvCGRa&lI z;gB{~7<4z-ZmDs8oeiNOciw1W4(UN+?Kin+t{)$WOsCf|8U) zd5iP56bvhEKg#9vICHj0+Ibr3HBO)r8B0S(nM_nDyAGte1}>|+xwFPHP!l$p0D>{{ zrZlj-OuG@Lct#M8l-h(i852&VWmMCD8lzU?OzA?SES$Mws*vd(y!ho9>}rcz>}u4I5-5t>g0Pr--hj#3|7R2G#CAaWv?PN|v4oQ;&Av1O=5U{=(HqWA0K zOigX-WnHMMR}E(x!^T_W&VWS|`Pne0>TMy#r&S=ePi0K_GiW%i-f0MA_bAMew4u{MXpiVwKt(qSeZMzzulr{{Ab`43p-G_Zat7| zls0{&X)Aj!ni5X4<-yi2%o3qV(&ef;OHOFt8O@7mm7=i)jJZ++dTp-O=r<&qQO+V* zuoQ>WkQg0Xq@J{8$7z59XUlqHY2Wv zJw*L(*vcH1rn$zh%=YEv;7Ue9pJZ`s8Y@*xt38SZ zhq|=UO2MR`vRkNnWCR&BE?e$%|8GdRTn0e_slruDgbOu?sC|CfzUM5EZ_kg?WZFjw zyCL9dldNwR3}yWsU7RX+B~Fv63k7SrKhsPt(IzF^zm&sI&W0b<5dI4Z@Ve#FZbYOy znyb}PV86UzK6;zUV)P@(;#bnD_D8N}2GtD)oF(|oAgH#4aexygr6p+SB@GDFIkm4a zMD1+z=d+#(U!B+=wF^#tAn=!C%MlR6UXYS`Qr80Af!#)u=XRJ8*`Qn0t%w;gR{>Lo zgM{d6g=mP{oXFv8=bu2aD}H%_#4Sy{Y2{Ly%wtdq{uRTT&x!vQG@UCo-)J;BRf1T( zKDh%g9gF@YDK9OwZU)0u>XIumCxU!+W#ep(H)H*G6;88==QUYj3J&HE36Zc5~4A7J{S$jcDX6li^;t{W9^j zn4$d|OC=e_-jtS9LU>3cWpOg@$pH=K2#;ke!Fb#xbZ|4 za%B-qt1s^RLf6VZ10rC|0UFo{nH7Ova`INp+YOU5* zBy<{~n9~^zh*aG|rK2jC`Fp!lSA+{~w48RaoRmVSEo}_|Lp%eCl8)Yx&ks8E8^g_Zoo`6Gzej*6s8^~n-8ewHN2XbO7qYra3L}Vmh zqj=`MMr=Gr;A*)8zlH|nDnQyhAJ04^DqLVu+^lV3njK{=FhUkoGd$Jo_nZ+*(%ja3W$!gfickp~##PdrL4ZD!@uN)YhKX$&5?Sl~r@#Jw1}O(4}w%y%f|QtpX{( zh=!~z=W4L4jY1KhMC>hZcnJzQ zw4ne=>eg1cl~qd$)DeV&5#N;{<*M7!fi4}7g;nlh9LK?2IpUSgQ^pAHSz*+0dml2h zhAQ_W@ASswr>gDAf~VbJ21iJ-tzd3y8%>U0?v^wL{KEd1aY8Zdy9Q2`e}5gUQngtH zxhlC;8gxKOBX(Wpf$%PEyg|RL^~w#1$Q|s@1}NcpJf@y;b(oo2pi5%Wa!KZv;^$0h{Mz}f=AN8-Ukx!aCmt-hl9mGg zO5CYXbmGu#cN=~t6YR~KNs-m6skld%m;tZr6En&UlsK}?20c?v!eZBC{JykrG(}Y% z)OwK_PEs6FANgdIs?c`L>3OJ1B1kaSqWrBaHZ07m8Q~))h=PCuHWB$Qjuj*VpWVQO z$uDfTX86Ww@L}26VxwNl*^N= zYpGLdD~a%I4TCb5L?lNsRXwm!R{zixQmIaHsa;F0O#U3A!>$gq%OfvIlt5g*apCCI za7v}oI!C~;qjWqbcBqa1>gvj1J(K|l!2cSo1x9)OAjpI99HAUJ$zL>rVRE5504^@~ zpn53P+3XZWPDQ*BFu~D3uB09Q?)XCYO2{7F2pAnUn7M#7!M12?O=xJ(IY4T3eMY9nyJ&4>-#hu{XcqW1@Al!7lbVJg-L z_7rIx%Xw!>DjLkqOnV`JxMJX{nyUi)$I*Kv$Rs3@Ig9a+qxa5<^6g1pTm<;;_-Ye~ z6R`mC=#vx$SK2>!r1v{k2mUStjz77^JEwOT6c$_LKp-V&5&DCTvS6)p9AYM?sfU9f zv3HXiAyY}Kh>0iiNjQQE(&$NpBpV$G%2l6SEWwm%)w|F75K3c>On$6Z+#o0%63L^j zWFPDLhW42GuMr(10w-tc{c?qwRYi#Hfvcpn=y0kmQgq5Rma!oz+c}g2rM(Bj$lp?H zB`dttb{^tsBv3qY{WOem5J>r4!c{y9)GnU|T0ESq>pQCcP@lO}?SPY5Y>Xxlgr&|v zFKqt(Ay@>{OD$FhVxSc<$;~eH^HW>4q^p^T zi?A|b6wV#>+evv)hN!zv$)pB2d4IvqL1GcUyM>7D8E9)60OG{ z{o|?rI4B?QJ4jlAY2rfVH4Zq8x zyDY^o2Pln2I8$SX_EzpUne{``hmJ3mxdsS$qIdYNN)7MrooQ*I8QRVnbg_QSt70n=2oa3+{ z3Kz$;uobV5qAMi^Vf69xy{+%zG?~g-t&fMj%%Uq~M?t*aE4_4vZXrq`&m2IbF|$3l zI}q&G-+|ilKE!3p zvQm?njxZR|u(zVLeXZ+hl|ku}%C6j8}ytONuy4h?fvQ?}CgP zb;45pwvJrF>XDB1;wyWUj`Mi~TgxGv8MaoE@8T3KN*k$30M=~tNdVX(YMWTZb{_a- z4ic(Kb+4&ZlD9*YH^kn<9n*>JK(aRyU_i?ZmO+lG>b)Z4L(hQ;nBW9L*M^c$0j-=} z3p3U%8D@!qN$RFNP;+Rwvoppw#DPx^j%i14HFw0!>l6=_70fH^B);}|TRAA|j(w@> z$63`2sHxU3e+0{Th_e`qAV2|Qa(y@MJw&5~wUC9}_|R2Vh=G-Vw+%>`LCPusA~Vfy z5rh(jMF7Rr0E=~uX<*W`bn+}k9hmbSpY33e`aAJt#8PnZD?ha}=$pfscaqQ?w$QFB zpw}FbVS!&sK#1>Lf8<)VhiJcR+%j;!P?nUdybklJfT7NvCLBjX`RLjuub?KzKDWCF zMiqD2*gl2dFOXtyPA&qdjKJ7a5g7HQ>p~)$;TM8MmIBwM6=)N^qIS=Rwu{Z|ufILM zLSsw=fyXLv2#pDr64E{qt~TEb#jH#)I-%8Hh4P(Bjpq36F%k)v0>gk)z^>qBo}Gb@ zu&3y{f_Pa9qy`Qy>?;sLC}ez*E%X?crK^hVNUzH~?#jVBXMCOYMhcDVn1DDvTl z;tMD{=w(A9piKMTQ7gG47x)PN{j?)ny7NNAS7%ln9Qp9e(eb9>c~z*641qTNS+{9X zshvG_9f;9Yq1&2+Sk*f|Q-a26 z5U52>?-Q8}X^`3Is-lI)>PCOO*ep}+80?%7CKIX z{zN$IRI&5JjCLDzM@5Hn^@F#c+rfb<0#E5dUYuqN1ky2Kd7zz%LA1*D%4K!nmmppW zjb~9p?qFi@G&&L=b(Ak`lfj!a7F{xyAFAX8`{z+GmoIZcluZuyJrbMnt*;W}=8;W@rpdHDmg>#NZ^iJ}8IxiuAQ{qkY zg}kHYg|e4TlDiN8bbmRz)L}&sP&7p0+<{+(g73~h9Q{8Rm*>Yju)q81ScQfpME&K-Vy?x8BNZg?0}*T;oIT7>8&I@y*3$zOyCDh4|edTAjKYx`3ok@L9pW5ksUyVWRr
)#e>fnu(rYbJOPQwO=+|x)~q*N5~w55fX z+iN+k?IHTV^1qzZw+9Lw^5_xJmy{J;CV-NAGI-^X~a8JZEUPQ2n|F|Re6;w%-*YpJ0QTP+0I zn3n{|ak9w5A3lFZol6oBEJ)`pJ45*OE1Hl*ZJ9d(YU4QW6juldK~~Q6_x1u29SD>{ z9rX2U`&smC^=X>_?vw;E;i8ko8>IqYGXHn?dwZq%e=z9wpXdK$JfA=Be1~Q<9D<54 zrU6OjG5J9%KiHd+A^L9T>(`bn)jGM0VcV>%d%%4WEnUtrG3B+h*vZR*=b)o5oB)qN z=NFZHUY0yJi4nd?T_y6+{s4Z`P;cY3og5g6eE6*>J=S}*84h){`_B{y;3k2bmJ&y& z^$((;L-|DFknIs@L_C}dqL01g#;3}gCJhK>p@Oww&g@fxUg{kQ9o!AcePZIh>apyFw=$oh|PhI?nple9ZdRl&LMSQs)OEhx8X{$nb~N z$Je4W>k|c~u%6_!7T(^Qz?jo08Kd@p6V87V?GiMF_dXm~_q)W2*1F)@`BV~!VaBRS@#!V!f2po@+(p?ENw!}{FSJ;2V~Y>y*2Ha`R%+>3*P5d+f{Ph zuF|XpU*dxibWyLT9pFF$7(H-<=eFr z-+*-i zMvfI!)yY4ZJ0U*cxNZ8E<7h(AUv9|!HTsJ>`91srRA=x@Ye9QMBmY#Owg{+4+NPiy zb6FRC{W?USKchbwjZph_R^ki#Gi3>}p@DFbCT$ez9UhZy7{YKc7JV zYtsMq794DK7R28@?*>|;|MzzfO85Wt`}>1~XZ`;%p3k3c{g98a*U>)0uU}jC{}s8u#Xcw%r@U7riDeMPDjx4s+1+V!gBy{S92Wz zlqm_qj+pMi+OV{;UO}?ji!|tSAI@kFz%p%8t0MIkO$bY|+L>M{c?uT?yvPDRRJs~C zwx4)Y>$WwsvcR<)5Iw9jgBhJVVOQ#WskJocH~e&Jui`*o5cw0e6P^-STpWaB`i`?S zHdpVot@HT$U0%I~;0&gD4?G1wRg9eV)01j~r-Q&9G=ZRY2i6Gq5z7|Cuk3yvM|DHX z7Qrjgm-o)2k*7p^?MOmsz)H01NC=DU`_S@2q6|oq(P09b(Uf36AR;@9z8WQm5b37{nS_!~Gprnxs_c6IVw5^@p-;*^A>!Qjx??Q{ij(6N|7YkFWr0!CvP$@+KR(i*A7YC zw{C_c3>{y7e48aDF2pIT0Qgl60FxbfX$uUo3pBpSbIe7|*QYz-`hh$mRpt0!i6nrr zq9ix$VDirsMDC~n8Ful@vFM;&1C>`Sy&^bnA_y7jb} zKvvJoc;;ootx2Mxyd$jU+pV`E=~zUdGyHjkL+Yu+`ckOVXtG|fG!51kdV!2Y)(d*c zLNAm8p^{q(`bnRF&oa`KCyTPuRZ3!&Iy~}`&q{X&Z_Y0Z#(f=ktgLl-wJK|M}09(@N>uexVKUGIQ%EwHtqhFi5AMPc7fJQi%l8>3W zh+1u8iOPGvnkdF`T;YbWZ~4(Qnh5-RwWFR5@&=j2G*vlSDhM8FNacl2B^cNybrX`< z*QhO8FA$cla)_@e_48cO3(^Eo>dmu@w?B#w`l#f9&I+aE88l)?H){c>N^V%m|M^{5 z>ME?2JIdCni@Vk$JBe*)>L&|{5biZi^p<^%xV2}jrpdmvVIj4hQ*|-J0y(t~gGDMO zHiN8@#Am;~M18;}J= zpH?!msbM%;2rYVJH|%_os_dD=mZO0e*R0J4*SZg)E{^EZ;Li7&-->pR_Auy3b1m*t*rnxfl7<8p4GsuJx%&w?w;IC0bHX0?f1IcKUsIuD1+D1;Ml`rhjO zZT0^;U6I||s*@e%`~mQa*HBsKPFA!t%+U-8A1||d z$mH{sC3J(}RmUXwL|?z|RD6t?pm6if*RR8c&k3GDYJ>uki!=x>^u1gQHR9}}O&p14 z!|E|nu~dH-EYhl|UCp%m3OM1()N#!GV?9MC>5!LRBCZChhCB3a&|rQOp_#jN0MRTn4`M6 zX$S80{8aqHw8GS6Eq2U3U&Z5-l?nYUP(>m;6~&A2N_hb5Ar%VNoWrc_&`hdb>Cm;T zVEIecATHEiVf8>LOTAVB(R{0fRLG-NQQ7`p3BXQ+R#D&jT(jicE9ye(%?wRNI#X-t zYAZfl;s2XFP4<7iK6^hL%l3bE%lUu${r>*$v;F@V&oYJUT=T%O%>&1mZx^7~Gq4KV(9O6G1cXc)o zH&xplOMq2uj8uWnyJA>lI5%x}HE(yV45XwkY;&(m!h@S;)V(t1O09LKN@I8D`$bi~ zoZajqn^w}ZYe81s?pFm|-`&0poY{h^0#Ur!x*3kW`&0!B-wKy;cjCoM0GVBs3zL@guigl%X^ylcays=ct zq~@NCX0BAF76JTctFle{pDn2zBP<;dmiN*Em&Si~%jdrb{oVa%{qHfJRo2bwfKYwQ zA&n+hAgE7-$7!r?Ao%M?LGsf!=8&1lbCan9iRN5|;lRIY#j!xh^Bz=b59)p~IjgD5 zF()L9m9$lk;|ulXJ-a2`j7O_*^M^@Gp8F3Qc_~Y__a85Lzm2C!{%hrQ!|2cD^1nA2 zl;c192haBZqdb)nomxsg%iPD>_fO_A$s+boFIvjApPe$2-E-JI>?$jhvxIpp7^3Ur z3wV=&ujaxoRtz0jXIpmjF@9>+etuSXR*?VNm9hRZutffM_ZRX%cK7$6-A4Jm#gkA?^B=B>8e@+}6URCWdOzcTmHnUH{qp|L-n0Jq zI8W{Q&&r!j%c5X|q;U4+tp}4``06Cgf%~ru5k&t{vwkf_bf`9P)YaiSq1=O{hkN)m zMlHv2o{;;95BE7gGvB?LPxjn)c(0ntEKbSUM|0j2GtG>W+h?X(hiPQbJ(j?#NfP#- zaNvAV|LaKRqLYYmvLzhL?7zK*`@i;j&*#4%=YhQB3E>fB`BB5JQiF|B8u&Dtpcs2M zctS*{^#WZ_sX!u)!99h1g=h}&}i}+aT4H!&IrVw_cz~ibl#J^fKmT zOz()VE(rfWUUkrU6wKjb@>r3CV!}~CBhqPg-d?#^3FD;o0v)q3WD)x1_zL-yi&kes zlO6b1k>Bc!KJgv+*SwfccH}?iPce&jazJXYUL{Iveb*7UaqGLz2;a26>m*^^`tJX0 zy+FTUPFX6@>Dv?0>cpJ=LA<2Zp+3PosvKv3{5y(?#rf}Xzb5qW-iDukn&Hrvz$B!u~?OYKRuj~ z3F9>XjDw(sknmVchA8uW=@eqZoUStmJ7ztFh42~ihj72MdZE%|+HcZPL19v*q*??w ze#3D1J`64nE;x-6!jD;yhEYbELU|hE2{G~Nu!SKYFPnZ<2nJA@Cm{-7-9TlMyT~9$&kZti453<=cJiD_tB`u8Z`v$hzL$65Jt(XTP%O~-fkw`0mfF&$QZmAX z@G3Gt(1?a`kGzdQRSfYP@B;}}Y>vJgrc@agaW9vHtpmEfJcEX1MP<kg&=UyR@~DoO%8JO`sW?RK$<*U=snZt#>_FB^r?)>G zbOuh`YnQ6lB($$XKVmE(II72A(HRzs84jqwCIU+`_$1~;4xGOZAp!n0cU3aaEPQ;; z)~Yb2N-Xij#Hf>K=FTvGfG!o&&{Zjx9|Ab^&@B#JX>_?B3uBx-L{B9Ihc5M9EyiJ~ zQ-<7ju_d1GPMN4}!_ui$o;%9)%hnVZ?rj!so~gjSA@h4-tGyawt346oyL=(6gIrvg zZOGO{Y&$*l1M;bm1L>Fh2cb|c;X~x~>PcMqR#>RNLHalm^T>16q0_awY0wSJ1aT5$ z$~OhPw*Xg=#0^Qv_}rD61`&yyFvYH0Wh_B`;$iOE3t8;|R;<*hWF^$C+edtbujf;BwD zK@-Zl@h+fz(_IOl9B-GCghb04x)RpjVHH}PcPK*$rdIV3Eg2yjms}P6Q5BtG#HP|e_0GB==AniE=K{%$fk zL7L&fEs(cyH}v{dU7$iLZU~9YzB{<}PgDMiP zRiS;H4posCwrS<#gjCyCYk`A4UK<>{jf95-!dLCJhnaSnr-kXG=iuDe=e!?GpV3&y zG{OP>RH;dB7ZZ(W;w~miTN_=CTB)&V{gsRfC)Eb&c3YRQ{{!Fuy|J7|>KYvl#vVMHB` z#vF@;r(TkBqRh)eLW_0ecmvQUwOt$5*y_Eb;$!aB%(msK3rW-IhE%shl`xiMeW_+0 zRXsT|^<`GE)U@NGcG12E9IIg)!;)OH4LEul$|kCF&|3m1>Dv~-1k*Zo`yOzLiGP~_ z)r&0}O$n#T(~BiT#&T2Sfh=YWHiKMNLpCF>&WN+I<uzF zhJ;t`tFF`!i`&%sl#Rv}GlKP$UF*(GwJ z+s>A6jq0QD@-)Ii_TPFNt`-m#roI7`@#Y}%>!%-XxKxz6%ZZ?$HrfGQvSN^tXjmsg zdRG-Ylzoq9Uc*;59xq#9Y5?Tv*q`2@QWwPg`KH3X2cj%CgltZM5Xb-g&P3vODW zsmL4^8=}Adzb}9DzYo9s=70b4x6W_==ickV*H?dg^_Rac!LFmMo&>)R^x9$vyd=N* z-@p1>M#lHA{-$63dUA37?!(W&)75C&YPYOURfzANY?LJKZ>%?H^h7g8V*XaRHBTH} zjejkHq_YUSIHoS#0Jc)3*J^Pkl`GaF!fm<#_NwtQ?dWuGF-^9HtXJ)8gsnoohxRB4 z!QxYxwl;9Pl^tne+E$we-5N}4>D@L%4pzbTfa6t4+g=TPty!#NVlw0Ln~IAW!I1{y zyPsIJxq0W0I^+(AaX>mAtDF*gkJ)&Rn>!tCb6Y#x*pO=RmN75cz}KOyPlNPv8+->R zZ~`~scs!=wgF5Q;G1~^?>3v zZ#{sw0*-=i!4FDO$0Jd~ao{W*JVm*rBO~EX;(;5|$#Q?kHbme-ugL|lqPa9ghhAz%|%4BS!b-K@EdbBhBPe{zjyPCL@q1~n0z z60?4D%Gc^tS6yp<7eTxDQ_4xX&(`1dXoQ}H#cm(8A$;8(%@XjZ@i|lw@f2>L5*f`W z|5u`;J_EpFIwpfdiCn_?$^q>U-U7eZWnzg|65@id7MR3zHcFuU1QD7 z!%;eM_2q;Q?8-9NmTB&N2yE6(jn#nH>Lg7+Wd2ssGh?RCTtDyC&7qBUr_NHf!Z$V5?!!dm^ffH|cOaHqe*BwWmEgq>D5XB)1P9>{J0y$)HYcQJ_fFaN+X;x%>VM6? zo#yUrxYc+({&9tvvxImF@$;5H0ToNmYdc8Ybx{3HE^BUG0ccgWX(`h2HY^(xOI{f@ z1SuOb0lhIU09B7DrfT3;o@w960eoP1E3b<2af5^ z;(liNn&fKK>p7rf>cSOp4Q*P<-I?7WSA0z7f+-b=G+RlORA*ScC%PK%Dn$9q5e;ax z9W12+!o$Iw4-tCNlzVW40Z|Bm)z&p-G>E5hs}(lqE8~50>Yl>iRtz4fj`q+buJ44? z0KO$JQXzz=+xPOEz;!0ud56U$QUOSLK4I)petjcFTS|G(`1pKgDD;r{>L!Snq;kMcao{XaJM zJk6y)IR)@Czv(CcuyDOk@zy~5PM;FA#fyAmwE+DaUg2|1aM-Gl>t<20612;rh!YXB zNYGJ0^xZwnE_RVa*GUKtPyGVs;_WEQkZU|w|MR`+xf)FQSas}z2CH?~P?e5ayn83R z%tqE)@g5r>Lg~rptUh)G{ZzUp>Efev zskEsT5$n>#mvu{Ho#k_^p(5kWj@IBr$BWYfK_5WFTbm}OAZ|{Uf>WSuD>n>fw?3Kc zMptRxamqP~5+vr4r>C&-R>vI1&s9IXsB`oo|w9)EQK}e{l-X_VH3MHEEc^kvJ*DW+>LsT=U z<`cxtOU|$Pu9|;k&lUSwmIjK7t8^s6pWMYYPPJ8RvZlO=ORd+eiEBd;sts$`S4q~7 zmn839zT3M}YRx5^!Yhz#k9jkxjX65kz61nvl@MPMaEYUa`&1t7nliND2Kn-9&w2Cv zZ~m9wZ~kxom;SF^XIK8&-}|-e?EU`gx6b1h+R=sj^6lW)uG9a0(Fx-Pl_w?}N3%(~ zI3@kf>a1o*zpAy~j?;!Qnp+8M-C8iF7`S7`J)$lg6Un?ee4$=Sia~a7*;<4oM(x^y zlknHB^XB*OUpX(kz_nj`zjk~5-}AqJ?e%|$GLlhyzrXtRI{E#j{H0z><{te1YWNaZ z8{QTE__E)9_42ol#`3q9FMs{ssj6>PuiI~Xfv%?naWWxyvAScM2rv<(vg*h_LFynL zdU^TNF&Yd8Z_t%;wW7Vw{wtJBaRS;49aAC@hJO6SB7(3$I6`bZ79`0p^G+E0czs+$ z%ZZAQ7^2>rH~UVn@ATeW_x6W_H^aRHr+YZ83Ef3E5_ZU)(HGm_AykJ(PS@Ts3-R6CACEWP$ohu2r51GH2iaF@$Yq39(GHfU z4^{UHF4JNf6_C|3b0g%%Y18Kw1~tRCW}Jq4lnMPXq-+wCpi}^9gzZ1Um4^AkW)d)pY^C+llyF#M4S@*mED;-)30fn2p2dA#E4SFOk?7?&y~z&1d=SEo^aY&`GV1mFXNio9po|8Ys4 zndMMaGd6{#duK~vwnNj^H2h_aJBdj&drZrA`}cJ&y_Kk`F{@s0{Vg`S$(i%-G=PCE zA1>=}$83;$1rS%Yr}Y{I{pP3iLM)ZpNY3DY(8y=E+x5M!;uQJ~efRR^2Nr#~PRW;l z5dX{dH2v}ur(dpc^5rUxUJYL=%k+yhRsZ&zZ;V>`^Gn0GSI*0IYyO75tLQ4&(NL+q zj+!!iJ@g76F`pdO-nq4bnV6-+e+$|0ud-zLr|KRj_4?$Fcm5+ zmA-dXEWp?QVc4E{os@5u2@hT~R!7r=!NrnTJW`!AZjB zt0bClxZo&Y&G$WTbu=5r>V3d1kFS|W-juV5rD6kSFGF!9K5xw{+ihTQY3tH_vh~B3 zB#r04t1HILe^R&K%6A7gj_qpO2Ql+6G^%5X>FmCU^4Q?5#?8$Z;=47v#!j78MPaYd z2=y$9J?T{*2R9#UvP!CtyGbv}tGx5HDGU zZTM9sxJL9X>{mU^6@E>jZd-_?YmBE_$r5{k-V%?7I6x6jQjP;OW-3M>jpitPjTlFM zeTfFRK1&L)(ikNSB~wmF2GOSznuv0gjs>Lw{`Hg!LRT zSfG#w0Tl>C3~&QnZ8gXR!lP1Vb`S&-V=qZ@pbb`pIYDp-l!`*~nBN4`rjZjkF^fp% zxkI-s4SX~rXqrw4!jX@rjB_|YilgcvT?IE{iPRhBXi9>3oCcDV84joqvj`E+8Al-z z0#AteKUEMhi!|lcZc_!AMZp}X)e+J*e@#%V&FY@Rwnk5S%6lWJJ&> z!kL^oBZ4IV*L!+ipk#_w5Sz!iIymgpXkx-L>pFQ^0ON{t|DP;H9*ztzniHc~AdKPw z)5usEvN7;>Oz(*AzzK~8xTaPrWLqT1DFzY*sg#jK4AIGJbnzNpzeev~qYtmqO~;Va z02l{?Av2R=*|l=alUs(QMn1y3^unn~PRu=B@TqPFU~VH$zx+r1m$VO{^~gj|Oo0 zV7DUB9*75?nX{QNlg6Ll+W{lK0mZ-mmi~XIU{AQj{xXe@#K+2`08Ku_yzaZ|TlAM! z{^@F+nhB2l(RPCaH$5pi5u4T5ZGuZoHv+IMn{f>Q7LoJuVm)Vx$I|Myd)KwP?EZMI z?pojuUY)^xgGk@Cvn*H_L@lJ4FlEePm733qlonMc*RplFfP2kNB!osd@upX`Hv%r- zjmVD+txbbDoZ&HPv##&W9MhoofcaB+GS$$2TaL_Cq81!PW+Y0k=W)I7Vl{_o24@xD z<Z>$dTLBj1dBE^CA#%;YCmT0frL4J^#*|cDOSi#ZRqial?@F6hTx*^4B;>J_ zYvd=o=Cuwnr!$<8pUHe}5FXy3>ec#Pkg$O8W{r2dE8Mbq+z>ppbXqJ65L#hgHEmx? zHa+<>#Z@<2WZ&(VXwD zh{vM(*t;fmAQj}{w}xtNrrM%4SQoFeG!aunIL`+A^bQ)$V=M#@s`=PKKmPOL=<4e7 z{Z-BPh%JL~cD@V-Wa=aSsOIzW<;l_Y$=e@mDOghf?0g9XRiCpO{xuX_p1(g?LPG-# zLq!7=8chkO)%ul#PS5_w$>r&FEd|ZB&(53c2W(P%In(>|cc*8yc$;dToj29hJF!Vs z+=?o3d2;do^!Vud^t>Mbawuo#%i&~~c-4Hr`gn12`SI%HvX+iz5YEo)V1U?x(+o74 zs0IE~`=%b#K~yP0fVO|oWO^E11lS|rDtX@+U9-m1`|D}VCUva+G^Z|NiU|F_%g zw^Jqv3Q0I3T%cPT1S&>#L?m^@S26Eo;ZmH37?2N&ipLp}8n$}UAyIiiZ>Q{$2I8p| zljrAAo<;qiMn1XQ{L(+`S)%{%4-U%u|L(!w{}+0&w4HE^8W?SP`YWMLftrV{$myA0Gm+DU-^&IZ831$uu2x zJQnVN#^|%1MOy|bSLrR|er`DEQu@zASqFImOMNGTyBJIbm0v^u1)-|&8#0R8IbIz^ zLQI1p%5T{I@0zwwcCt&E9REwbZsl*Pi7(h1&ixyo@?fFiSqVq+P$!vuf+Dj8-dcqV z`mQ8$H(hVgANg;_-hQ{+?_tk-v$wbB_4a$+ zgE!;d0Uqq{c?aFzL66{Zzvn-5;e&BuztgYeLd9FFaA9vnS=im*@AlvHo{$R%Z+g3< zJ<{tPjC|ZZ9PEy}d)}LV_h8)Z9*{ov1_%Aa{atUoPY(Be&+C)kV81^ak==c-x9h)o z=E8^K!d{Im?5!*dyPe)DT-ZB2+B{qdWwclhSe!+URfWHi8oL3hwU>>UioV~qXrX#B?a{oR9I|Ipj* z6Ti1RAinp8492_tgZ*bFd>|%#Q!NQ4XH7^Xi!}(h{WpU__f5uEPi=TTKhMwe^ZY#V S^Zy3`0RR8CwTid^ya51-zkyHy literal 18158 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 diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index d667816fb..472be7443 100644 --- a/charts/postgres-operator/values.yaml +++ b/charts/postgres-operator/values.yaml @@ -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 diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md index 76ccf40da..5b1eb64c9 100644 --- a/docs/reference/operator_parameters.md +++ b/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 diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index 06497b75e..fc1013935 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -18,11 +18,11 @@ data: connection_pooler_default_memory_limit: 100Mi connection_pooler_default_memory_request: 100Mi connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-32" - # connection_pooler_max_db_connections: 60 - # connection_pooler_mode: "transaction" - # connection_pooler_number_of_instances: 2 - # connection_pooler_schema: "pooler" - # connection_pooler_user: "pooler" + connection_pooler_max_db_connections: "60" + connection_pooler_mode: "transaction" + connection_pooler_number_of_instances: "2" + connection_pooler_schema: "pooler" + connection_pooler_user: "pooler" crd_categories: "all" # custom_service_annotations: "keyx:valuez,keya:valuea" # custom_pod_annotations: "keya:valuea,keyb:valueb" @@ -36,15 +36,15 @@ data: # delete_annotation_name_key: delete-clustername docker_image: ghcr.io/zalando/spilo-16:3.3-p1 # downscaler_annotations: "deployment-time,downscaler/*" - # enable_admin_role_for_users: "true" - # enable_crd_registration: "true" - # enable_cross_namespace_secret: "false" + enable_admin_role_for_users: "true" + enable_crd_registration: "true" + enable_cross_namespace_secret: "false" enable_finalizers: "false" - # enable_database_access: "true" + enable_database_access: "true" enable_ebs_gp3_migration: "false" - # enable_ebs_gp3_migration_max_size: "1000" - # enable_init_containers: "true" - # enable_lazy_spilo_upgrade: "false" + enable_ebs_gp3_migration_max_size: "1000" + enable_init_containers: "true" + enable_lazy_spilo_upgrade: "false" enable_master_load_balancer: "false" enable_master_pooler_load_balancer: "false" enable_password_rotation: "false" @@ -52,22 +52,22 @@ data: enable_owner_references: "false" enable_persistent_volume_claim_deletion: "true" enable_pgversion_env_var: "true" - # enable_pod_antiaffinity: "false" - # enable_pod_disruption_budget: "true" - # enable_postgres_team_crd: "false" - # enable_postgres_team_crd_superusers: "false" + enable_pod_antiaffinity: "false" + enable_pod_disruption_budget: "true" + enable_postgres_team_crd: "false" + enable_postgres_team_crd_superusers: "false" enable_readiness_probe: "false" enable_replica_load_balancer: "false" enable_replica_pooler_load_balancer: "false" enable_secrets_deletion: "true" - # enable_shm_volume: "true" - # enable_sidecars: "true" + enable_shm_volume: "true" + enable_sidecars: "true" enable_spilo_wal_path_compat: "true" enable_team_id_clustername_prefix: "false" enable_team_member_deprecation: "false" - # enable_team_superuser: "false" + enable_team_superuser: "false" enable_teams_api: "false" - # etcd_host: "" + etcd_host: "" external_traffic_policy: "Cluster" # gcp_credentials: "" # ignored_annotations: "" @@ -77,56 +77,55 @@ data: # inherited_annotations: owned-by # inherited_labels: application,environment # kube_iam_role: "" - # kubernetes_use_configmaps: "false" + kubernetes_use_configmaps: "false" # log_s3_bucket: "" # logical_backup_azure_storage_account_name: "" # logical_backup_azure_storage_container: "" # logical_backup_azure_storage_account_key: "" # logical_backup_cpu_limit: "" # logical_backup_cpu_request: "" + logical_backup_cronjob_environment_secret: "" logical_backup_docker_image: "ghcr.io/zalando/postgres-operator/logical-backup:v1.13.0" # logical_backup_google_application_credentials: "" logical_backup_job_prefix: "logical-backup-" # logical_backup_memory_limit: "" # logical_backup_memory_request: "" logical_backup_provider: "s3" - # logical_backup_s3_access_key_id: "" + logical_backup_s3_access_key_id: "" logical_backup_s3_bucket: "my-bucket-url" - # logical_backup_s3_bucket_prefix: "spilo" - # logical_backup_s3_region: "" - # logical_backup_s3_endpoint: "" - # logical_backup_s3_secret_access_key: "" + logical_backup_s3_bucket_prefix: "spilo" + logical_backup_s3_region: "" + logical_backup_s3_endpoint: "" + logical_backup_s3_secret_access_key: "" logical_backup_s3_sse: "AES256" - # logical_backup_s3_retention_time: "" + logical_backup_s3_retention_time: "" logical_backup_schedule: "30 00 * * *" - # logical_backup_cronjob_environment_secret: "" major_version_upgrade_mode: "manual" # major_version_upgrade_team_allow_list: "" master_dns_name_format: "{cluster}.{namespace}.{hostedzone}" - # master_legacy_dns_name_format: "{cluster}.{team}.{hostedzone}" - # master_pod_move_timeout: 20m - # max_instances: "-1" - # min_instances: "-1" + master_legacy_dns_name_format: "{cluster}.{team}.{hostedzone}" + master_pod_move_timeout: 20m # max_cpu_request: "1" + max_instances: "-1" # max_memory_request: 4Gi - # min_cpu_limit: 250m - # min_memory_limit: 250Mi - # minimal_major_version: "12" + min_cpu_limit: 250m + min_instances: "-1" + min_memory_limit: 250Mi + minimal_major_version: "12" # node_readiness_label: "status:ready" # node_readiness_label_merge: "OR" - # oauth_token_secret_name: postgresql-operator - # pam_configuration: | - # https://info.example.com/oauth2/tokeninfo?access_token= uid realm=/employees - # pam_role_name: zalandos + oauth_token_secret_name: postgresql-operator + pam_configuration: "https://info.example.com/oauth2/tokeninfo?access_token= uid realm=/employees" + pam_role_name: zalandos patroni_api_check_interval: "1s" patroni_api_check_timeout: "5s" - # password_rotation_interval: "90" - # password_rotation_user_retention: "180" + password_rotation_interval: "90" + password_rotation_user_retention: "180" pdb_master_label_selector: "true" pdb_name_format: "postgres-{cluster}-pdb" persistent_volume_claim_retention_policy: "when_deleted:retain,when_scaled:retain" - # pod_antiaffinity_preferred_during_scheduling: "false" - # pod_antiaffinity_topology_key: "kubernetes.io/hostname" + pod_antiaffinity_preferred_during_scheduling: "false" + pod_antiaffinity_topology_key: "kubernetes.io/hostname" pod_deletion_wait_timeout: 10m # pod_environment_configmap: "default/my-custom-config" # pod_environment_secret: "my-custom-secret" @@ -134,17 +133,17 @@ data: pod_management_policy: "ordered_ready" # pod_priority_class_name: "postgres-pod-priority" pod_role_label: spilo-role - # pod_service_account_definition: "" + pod_service_account_definition: "" pod_service_account_name: "postgres-pod" - # pod_service_account_role_binding_definition: "" + pod_service_account_role_binding_definition: "" pod_terminate_grace_period: 5m - # postgres_superuser_teams: "postgres_superusers" - # protected_role_names: "admin,cron_admin" + postgres_superuser_teams: "postgres_superusers" + protected_role_names: "admin,cron_admin" ready_wait_interval: 3s ready_wait_timeout: 30s repair_period: 5m replica_dns_name_format: "{cluster}-repl.{namespace}.{hostedzone}" - # replica_legacy_dns_name_format: "{cluster}-repl.{team}.{hostedzone}" + replica_legacy_dns_name_format: "{cluster}-repl.{team}.{hostedzone}" replication_username: standby resource_check_interval: 3s resource_check_timeout: 10m @@ -154,7 +153,7 @@ data: secret_name_template: "{username}.{cluster}.credentials.{tprkind}.{tprgroup}" share_pgsocket_with_sidecars: "false" # sidecar_docker_images: "" - # set_memory_request_to_limit: "false" + set_memory_request_to_limit: "false" spilo_allow_privilege_escalation: "true" # spilo_runasuser: 101 # spilo_runasgroup: 103 @@ -162,10 +161,10 @@ data: spilo_privileged: "false" storage_resize_mode: "pvc" super_username: postgres - # target_major_version: "16" - # team_admin_role: "admin" - # team_api_role_configuration: "log_statement:all" - # teams_api_url: http://fake-teams-api.default.svc.cluster.local + target_major_version: "16" + team_admin_role: "admin" + team_api_role_configuration: "log_statement:all" + teams_api_url: http://fake-teams-api.default.svc.cluster.local # toleration: "key:db-only,operator:Exists,effect:NoSchedule" # wal_az_storage_account: "" # wal_gs_bucket: "" diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml index e0e37dde9..c2b0cf398 100644 --- a/manifests/operatorconfiguration.crd.yaml +++ b/manifests/operatorconfiguration.crd.yaml @@ -158,7 +158,7 @@ spec: properties: major_version_upgrade_mode: type: string - default: "off" + default: "manual" major_version_upgrade_team_allow_list: type: array items: @@ -470,7 +470,6 @@ spec: type: string additional_secret_mount_path: type: string - default: "/meta/credentials" aws_region: type: string default: "eu-central-1" diff --git a/manifests/postgres-operator.yaml b/manifests/postgres-operator.yaml index fbba84c7f..19fdc4ef4 100644 --- a/manifests/postgres-operator.yaml +++ b/manifests/postgres-operator.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: postgres-operator containers: - name: postgres-operator - image: ghcr.io/zalando/postgres-operator:v1.13.0 + image: registry.opensource.zalan.do/acid/postgres-operator-ui-test:3d448b0-pr-2729-3 imagePullPolicy: IfNotPresent resources: requests: diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index 68273cadc..ecb7a03de 100644 --- a/manifests/postgresql-operator-default-configuration.yaml +++ b/manifests/postgresql-operator-default-configuration.yaml @@ -36,7 +36,7 @@ configuration: replication_username: standby super_username: postgres major_version_upgrade: - major_version_upgrade_mode: "off" + major_version_upgrade_mode: "manual" # major_version_upgrade_team_allow_list: # - acid minimal_major_version: "12" diff --git a/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go b/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go index 17a1a4688..eb01d450c 100644 --- a/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go +++ b/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go @@ -47,7 +47,7 @@ type PostgresUsersConfiguration struct { // MajorVersionUpgradeConfiguration defines how to execute major version upgrades of Postgres. type MajorVersionUpgradeConfiguration struct { - MajorVersionUpgradeMode string `json:"major_version_upgrade_mode" default:"off"` // off - no actions, manual - manifest triggers action, full - manifest and minimal version violation trigger upgrade + MajorVersionUpgradeMode string `json:"major_version_upgrade_mode" default:"manual"` // off - no actions, manual - manifest triggers action, full - manifest and minimal version violation trigger upgrade MajorVersionUpgradeTeamAllowList []string `json:"major_version_upgrade_team_allow_list,omitempty"` MinimalMajorVersion string `json:"minimal_major_version" default:"12"` TargetMajorVersion string `json:"target_major_version" default:"16"` @@ -160,7 +160,7 @@ type AWSGCPConfiguration struct { LogS3Bucket string `json:"log_s3_bucket,omitempty"` KubeIAMRole string `json:"kube_iam_role,omitempty"` AdditionalSecretMount string `json:"additional_secret_mount,omitempty"` - AdditionalSecretMountPath string `json:"additional_secret_mount_path" default:"/meta/credentials"` + AdditionalSecretMountPath string `json:"additional_secret_mount_path,omitempty"` EnableEBSGp3Migration bool `json:"enable_ebs_gp3_migration" default:"false"` EnableEBSGp3MigrationMaxSize int64 `json:"enable_ebs_gp3_migration_max_size" default:"1000"` } diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go index 26d25ebca..78e752f1d 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -60,7 +60,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur result.PasswordRotationUserRetention = util.CoalesceUInt32(fromCRD.PostgresUsersConfiguration.DeepCopy().PasswordRotationUserRetention, 180) // major version upgrade config - result.MajorVersionUpgradeMode = util.Coalesce(fromCRD.MajorVersionUpgrade.MajorVersionUpgradeMode, "off") + result.MajorVersionUpgradeMode = util.Coalesce(fromCRD.MajorVersionUpgrade.MajorVersionUpgradeMode, "manual") result.MajorVersionUpgradeTeamAllowList = fromCRD.MajorVersionUpgrade.MajorVersionUpgradeTeamAllowList result.MinimalMajorVersion = util.Coalesce(fromCRD.MajorVersionUpgrade.MinimalMajorVersion, "12") result.TargetMajorVersion = util.Coalesce(fromCRD.MajorVersionUpgrade.TargetMajorVersion, "16") @@ -174,7 +174,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur result.GCPCredentials = fromCRD.AWSGCP.GCPCredentials result.WALAZStorageAccount = fromCRD.AWSGCP.WALAZStorageAccount result.AdditionalSecretMount = fromCRD.AWSGCP.AdditionalSecretMount - result.AdditionalSecretMountPath = util.Coalesce(fromCRD.AWSGCP.AdditionalSecretMountPath, "/meta/credentials") + result.AdditionalSecretMountPath = fromCRD.AWSGCP.AdditionalSecretMountPath result.EnableEBSGp3Migration = fromCRD.AWSGCP.EnableEBSGp3Migration result.EnableEBSGp3MigrationMaxSize = util.CoalesceInt64(fromCRD.AWSGCP.EnableEBSGp3MigrationMaxSize, 1000) diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 58c0e0de9..4c7b8db10 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -192,7 +192,7 @@ type Config struct { GCPCredentials string `name:"gcp_credentials"` WALAZStorageAccount string `name:"wal_az_storage_account"` AdditionalSecretMount string `name:"additional_secret_mount"` - AdditionalSecretMountPath string `name:"additional_secret_mount_path" default:"/meta/credentials"` + AdditionalSecretMountPath string `name:"additional_secret_mount_path"` EnableEBSGp3Migration bool `name:"enable_ebs_gp3_migration" default:"false"` EnableEBSGp3MigrationMaxSize int64 `name:"enable_ebs_gp3_migration_max_size" default:"1000"` DebugLogging bool `name:"debug_logging" default:"true"` @@ -244,7 +244,7 @@ type Config struct { EnablePgVersionEnvVar bool `name:"enable_pgversion_env_var" default:"true"` EnableSpiloWalPathCompat bool `name:"enable_spilo_wal_path_compat" default:"false"` EnableTeamIdClusternamePrefix bool `name:"enable_team_id_clustername_prefix" default:"false"` - MajorVersionUpgradeMode string `name:"major_version_upgrade_mode" default:"off"` + MajorVersionUpgradeMode string `name:"major_version_upgrade_mode" default:"manual"` MajorVersionUpgradeTeamAllowList []string `name:"major_version_upgrade_team_allow_list" default:""` MinimalMajorVersion string `name:"minimal_major_version" default:"12"` TargetMajorVersion string `name:"target_major_version" default:"16"` From e4a91571ab521b091c1e03fbea3ba40407c099c2 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 22 Aug 2024 10:57:41 +0200 Subject: [PATCH 3/4] forgot to revert deployment --- manifests/postgres-operator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/postgres-operator.yaml b/manifests/postgres-operator.yaml index 19fdc4ef4..fbba84c7f 100644 --- 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-ui-test:3d448b0-pr-2729-3 + image: ghcr.io/zalando/postgres-operator:v1.13.0 imagePullPolicy: IfNotPresent resources: requests: From c001bfbc0783934d732b50c0c3eefdea8fa3d716 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 22 Aug 2024 12:13:55 +0200 Subject: [PATCH 4/4] one last variable to fully align with CRD config --- manifests/configmap.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index fc1013935..1c8c8fdfd 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -38,6 +38,7 @@ data: # downscaler_annotations: "deployment-time,downscaler/*" enable_admin_role_for_users: "true" enable_crd_registration: "true" + enable_crd_validation: "true" enable_cross_namespace_secret: "false" enable_finalizers: "false" enable_database_access: "true"