From 31e623e91000d7487e022c6c23896d6cd04db646 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 14 Apr 2022 15:12:38 +0200 Subject: [PATCH] bump to v1.8.0 --- .../postgres-operator-issue-template.md | 2 +- README.md | 10 +-- charts/postgres-operator-ui/Chart.yaml | 4 +- charts/postgres-operator-ui/index.yaml | 60 +++++++++--------- .../postgres-operator-ui-1.5.0.tgz | Bin 3512 -> 0 bytes .../postgres-operator-ui-1.8.0.tgz | Bin 0 -> 4852 bytes charts/postgres-operator-ui/values.yaml | 2 +- charts/postgres-operator/Chart.yaml | 4 +- .../crds/operatorconfigurations.yaml | 4 +- charts/postgres-operator/index.yaml | 58 ++++++++--------- .../postgres-operator-1.5.0.tgz | Bin 15565 -> 0 bytes .../postgres-operator-1.8.0.tgz | Bin 0 -> 16609 bytes charts/postgres-operator/values.yaml | 6 +- docs/administrator.md | 2 +- docs/quickstart.md | 25 +++++--- docs/reference/operator_parameters.md | 2 +- go.mod | 2 +- kubectl-pg/go.mod | 2 +- manifests/complete-postgres-manifest.yaml | 2 +- manifests/configmap.yaml | 4 +- manifests/operatorconfiguration.crd.yaml | 4 +- manifests/postgres-operator.yaml | 2 +- ...gresql-operator-default-configuration.yaml | 4 +- pkg/controller/operator_config.go | 4 +- pkg/util/config/config.go | 4 +- ui/manifests/deployment.yaml | 2 +- 26 files changed, 107 insertions(+), 102 deletions(-) delete mode 100644 charts/postgres-operator-ui/postgres-operator-ui-1.5.0.tgz create mode 100644 charts/postgres-operator-ui/postgres-operator-ui-1.8.0.tgz delete mode 100644 charts/postgres-operator/postgres-operator-1.5.0.tgz create mode 100644 charts/postgres-operator/postgres-operator-1.8.0.tgz diff --git a/.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md b/.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md index 70d77b80a..a33b556cc 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. registry.opensource.zalan.do/acid/postgres-operator:v1.7.1 +- **Which image of the operator are you using?** e.g. registry.opensource.zalan.do/acid/postgres-operator:v1.8.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/README.md b/README.md index d51814963..137f46a44 100644 --- a/README.md +++ b/README.md @@ -17,15 +17,15 @@ pipelines with no access to Kubernetes API directly, promoting infrastructure as * Live volume resize without pod restarts (AWS EBS, PVC) * Database connection pooling with PGBouncer * Support fast in place major version upgrade to PG13. Supports global upgrade of all clusters. -* Restore and cloning Postgres clusters (incl. major version upgrade) -* Additionally logical backups to S3 bucket can be configured -* Standby cluster from S3 WAL archive +* Restore and cloning Postgres clusters on AWS, GCS and Azure +* Additionally logical backups to S3 or GCS bucket can be configured +* Standby cluster from S3 or GCS WAL archive * Configurable for non-cloud environments * Basic credential and user management on K8s, eases application deployments * Support for custom TLS certificates * UI to create and edit Postgres cluster manifests -* Works well on Amazon AWS, Google Cloud, OpenShift and locally on Kind * Support for AWS EBS gp2 to gp3 migration, supporting iops and throughput configuration +* Compatible with OpenShift ### PostgreSQL features @@ -61,7 +61,7 @@ We introduce the major version into the backup path to smoothen the [major versi The new operator configuration can set a compatibility flag *enable_spilo_wal_path_compat* to make Spilo look for wal segments in the current path but also old format paths. This comes at potential performance costs and should be disabled after a few days. -The newest Spilo image is: `registry.opensource.zalan.do/acid/spilo-14:2.1-p4` +The newest Spilo image is: `registry.opensource.zalan.do/acid/spilo-14:2.1-p5` The last Spilo 12 image is: `registry.opensource.zalan.do/acid/spilo-12:1.6-p5` diff --git a/charts/postgres-operator-ui/Chart.yaml b/charts/postgres-operator-ui/Chart.yaml index 9e38f218a..467e19b45 100644 --- a/charts/postgres-operator-ui/Chart.yaml +++ b/charts/postgres-operator-ui/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: postgres-operator-ui -version: 1.7.1 -appVersion: 1.7.1 +version: 1.8.0 +appVersion: 1.8.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 f0005e003..1bf790b0c 100644 --- a/charts/postgres-operator-ui/index.yaml +++ b/charts/postgres-operator-ui/index.yaml @@ -1,9 +1,32 @@ apiVersion: v1 entries: postgres-operator-ui: + - apiVersion: v1 + appVersion: 1.8.0 + created: "2022-04-14T15:02:41.631562048+02:00" + description: Postgres Operator UI provides a graphical interface for a convenient + database-as-a-service user experience + digest: 2b606496de40535f5b9cc242a9fe500b5f31b8aa6ae4947dc6ddd16f0ebb6736 + home: https://github.com/zalando/postgres-operator + keywords: + - postgres + - operator + - ui + - cloud-native + - patroni + - spilo + maintainers: + - email: opensource@zalando.de + name: Zalando + name: postgres-operator-ui + sources: + - https://github.com/zalando/postgres-operator + urls: + - postgres-operator-ui-1.8.0.tgz + version: 1.8.0 - apiVersion: v1 appVersion: 1.7.1 - created: "2021-11-03T11:44:00.75040818+01:00" + created: "2022-04-14T15:02:41.63099634+02:00" description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience digest: 97aed1a1d37cd5f8441eea9522f38e56cc829786ad2134c437a5e6a15c995869 @@ -26,7 +49,7 @@ entries: version: 1.7.1 - apiVersion: v1 appVersion: 1.7.0 - created: "2021-11-03T11:44:00.748544296+01:00" + created: "2022-04-14T15:02:41.630465104+02:00" description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience digest: 37fba1968347daad393dbd1c6ee6e5b6a24d1095f972c0102197531c62dcada8 @@ -49,7 +72,7 @@ entries: version: 1.7.0 - apiVersion: v1 appVersion: 1.6.3 - created: "2021-11-03T11:44:00.745261041+01:00" + created: "2022-04-14T15:02:41.629551419+02:00" description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience digest: 08b810aa632dcc719e4785ef184e391267f7c460caa99677f2d00719075aac78 @@ -72,7 +95,7 @@ entries: version: 1.6.3 - apiVersion: v1 appVersion: 1.6.2 - created: "2021-11-03T11:44:00.743617168+01:00" + created: "2022-04-14T15:02:41.629063946+02:00" description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience digest: 14d1559bb0bd1e1e828f2daaaa6f6ac9ffc268d79824592c3589b55dd39241f6 @@ -95,7 +118,7 @@ entries: version: 1.6.2 - apiVersion: v1 appVersion: 1.6.1 - created: "2021-11-03T11:44:00.741913772+01:00" + created: "2022-04-14T15:02:41.628560061+02:00" description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience digest: 3d321352f2f1e7bb7450aa8876e3d818aa9f9da9bd4250507386f0490f2c1969 @@ -118,7 +141,7 @@ entries: version: 1.6.1 - apiVersion: v1 appVersion: 1.6.0 - created: "2021-11-03T11:44:00.740290409+01:00" + created: "2022-04-14T15:02:41.628053183+02:00" description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience digest: 1e0aa1e7db3c1daa96927ffbf6fdbcdb434562f961833cb5241ddbe132220ee4 @@ -139,27 +162,4 @@ entries: urls: - postgres-operator-ui-1.6.0.tgz version: 1.6.0 - - apiVersion: v1 - appVersion: 1.5.0 - created: "2021-11-03T11:44:00.738607341+01:00" - description: Postgres Operator UI provides a graphical interface for a convenient - database-as-a-service user experience - digest: c91ea39e6d51d57f4048fb1b6ec53b40823f2690eb88e4e4f1a036367b9fdd61 - home: https://github.com/zalando/postgres-operator - keywords: - - postgres - - operator - - ui - - cloud-native - - patroni - - spilo - maintainers: - - email: opensource@zalando.de - name: Zalando - name: postgres-operator-ui - sources: - - https://github.com/zalando/postgres-operator - urls: - - postgres-operator-ui-1.5.0.tgz - version: 1.5.0 -generated: "2021-11-03T11:44:00.736383918+01:00" +generated: "2022-04-14T15:02:41.627369658+02:00" diff --git a/charts/postgres-operator-ui/postgres-operator-ui-1.5.0.tgz b/charts/postgres-operator-ui/postgres-operator-ui-1.5.0.tgz deleted file mode 100644 index d8527f293f9ad6864a4c19af3b7980964c1bb0f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3512 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 diff --git a/charts/postgres-operator-ui/postgres-operator-ui-1.8.0.tgz b/charts/postgres-operator-ui/postgres-operator-ui-1.8.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..28dfd35ab0163c58e958ce95622957e337a9b0cd GIT binary patch literal 4852 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 ahjJ)~awvaj`QHEl0RR8Wo?sIIZU6vVgr)2N literal 0 HcmV?d00001 diff --git a/charts/postgres-operator-ui/values.yaml b/charts/postgres-operator-ui/values.yaml index c8353667e..6fa9e11cc 100644 --- a/charts/postgres-operator-ui/values.yaml +++ b/charts/postgres-operator-ui/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: registry: registry.opensource.zalan.do repository: acid/postgres-operator-ui - tag: v1.7.1 + tag: v1.8.0 pullPolicy: "IfNotPresent" # Optionally specify an array of imagePullSecrets. diff --git a/charts/postgres-operator/Chart.yaml b/charts/postgres-operator/Chart.yaml index 7bc9ce866..7afbf2354 100644 --- a/charts/postgres-operator/Chart.yaml +++ b/charts/postgres-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: postgres-operator -version: 1.7.1 -appVersion: 1.7.1 +version: 1.8.0 +appVersion: 1.8.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 03b5d7629..4e708ace6 100644 --- a/charts/postgres-operator/crds/operatorconfigurations.yaml +++ b/charts/postgres-operator/crds/operatorconfigurations.yaml @@ -68,7 +68,7 @@ spec: type: string docker_image: type: string - default: "registry.opensource.zalan.do/acid/spilo-14:2.1-p4" + default: "registry.opensource.zalan.do/acid/spilo-14:2.1-p5" enable_crd_registration: type: boolean default: true @@ -450,7 +450,7 @@ spec: properties: logical_backup_docker_image: type: string - default: "registry.opensource.zalan.do/acid/logical-backup:v1.7.1" + default: "registry.opensource.zalan.do/acid/logical-backup:v1.8.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 a5a5d4fc6..60a4fb8b9 100644 --- a/charts/postgres-operator/index.yaml +++ b/charts/postgres-operator/index.yaml @@ -1,9 +1,31 @@ apiVersion: v1 entries: postgres-operator: + - apiVersion: v1 + appVersion: 1.8.0 + created: "2022-04-14T15:02:07.818613578+02:00" + description: Postgres Operator creates and manages PostgreSQL clusters running + in Kubernetes + digest: 3ae232cf009e09aa2ad11c171484cd2f1b72e63c59735e58fbe2b6eb842f4c86 + home: https://github.com/zalando/postgres-operator + keywords: + - postgres + - operator + - cloud-native + - patroni + - spilo + maintainers: + - email: opensource@zalando.de + name: Zalando + name: postgres-operator + sources: + - https://github.com/zalando/postgres-operator + urls: + - postgres-operator-1.8.0.tgz + version: 1.8.0 - apiVersion: v1 appVersion: 1.7.1 - created: "2021-11-03T11:43:09.121092027+01:00" + created: "2022-04-14T15:02:07.817076674+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: 7262563bec0b058e669ae6bcff0226e33fa9ece9c41ac46a53274046afe7700c @@ -25,7 +47,7 @@ entries: version: 1.7.1 - apiVersion: v1 appVersion: 1.7.0 - created: "2021-11-03T11:43:09.119630978+01:00" + created: "2022-04-14T15:02:07.815161671+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: c3e99fb94305f81484b8b1af18eefb78681f3b5d057d5ad10565e4afb7c65ffe @@ -47,7 +69,7 @@ entries: version: 1.7.0 - apiVersion: v1 appVersion: 1.6.3 - created: "2021-11-03T11:43:09.118146221+01:00" + created: "2022-04-14T15:02:07.813087244+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: ea08f991bf23c9ad114bca98ebcbe3e2fa15beab163061399394905eaee89b35 @@ -69,7 +91,7 @@ entries: version: 1.6.3 - apiVersion: v1 appVersion: 1.6.2 - created: "2021-11-03T11:43:09.115637274+01:00" + created: "2022-04-14T15:02:07.8114121+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: d886f8a0879ca07d1e5246ee7bc55710e1c872f3977280fe495db6fc2057a7f4 @@ -91,7 +113,7 @@ entries: version: 1.6.2 - apiVersion: v1 appVersion: 1.6.1 - created: "2021-11-03T11:43:09.114107417+01:00" + created: "2022-04-14T15:02:07.809829808+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: 4ba5972cd486dcaa2d11c5613a6f97f6b7b831822e610fe9e10a57ea1db23556 @@ -113,7 +135,7 @@ entries: version: 1.6.1 - apiVersion: v1 appVersion: 1.6.0 - created: "2021-11-03T11:43:09.112550808+01:00" + created: "2022-04-14T15:02:07.808307624+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: f52149718ea364f46b4b9eec9a65f6253ad182bb78df541d14cd5277b9c8a8c3 @@ -133,26 +155,4 @@ entries: urls: - postgres-operator-1.6.0.tgz version: 1.6.0 - - apiVersion: v1 - appVersion: 1.5.0 - created: "2021-11-03T11:43:09.110907395+01:00" - description: Postgres Operator creates and manages PostgreSQL clusters running - in Kubernetes - digest: 198351d5db52e65cdf383d6f3e1745d91ac1e2a01121f8476f8b1be728b09531 - home: https://github.com/zalando/postgres-operator - keywords: - - postgres - - operator - - cloud-native - - patroni - - spilo - maintainers: - - email: opensource@zalando.de - name: Zalando - name: postgres-operator - sources: - - https://github.com/zalando/postgres-operator - urls: - - postgres-operator-1.5.0.tgz - version: 1.5.0 -generated: "2021-11-03T11:43:09.109237601+01:00" +generated: "2022-04-14T15:02:07.806370532+02:00" diff --git a/charts/postgres-operator/postgres-operator-1.5.0.tgz b/charts/postgres-operator/postgres-operator-1.5.0.tgz deleted file mode 100644 index 6e1a48ab772c479d991b518a7a5164311b93a632..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15565 zcmYM*Q*b8H8ZO}2nb@}NWMbR4ZCihA+qP}noN$7PJ()Q9PxjuY&gqM;zF5^)UG=T? zzE2ayz@UTt=K|7z&>2gqFq=xrbIN)1aG0=ZFq^4zSnH_ra4KqOaLQ}i*%&*Rd8;Wq z@=KZ9*@Im5d3)|~rc>_)Zd435th(yB%<7QKde~5|2x_amTbt^eV787(tph#$hh|#YU*r?Y6 zsAq?otuDdIP}MiGgOFx3fI|d9Zux7$$eyv|B5V{4w|tq8yR`;0ib_@5Dtb3qki{*xFuVBLe2{6hp53IQlNaB((pA$6V&wE0$a{+WyT`YKV ztAlfs!5(mnbSsTxV5geIn}UsQtOk_CSm%cDn1&GZijzo_wMR;mGO*lQT31HCO|4Z4 zd8*9^?@>);oC*?tM3UiFL-E2SK`4?QLjQbp{QFF{n)Z`Se=Rl~poPk?3V?~C$g)TZ z`UO5opAtFF0!x!lu2Yx@nh{i-D~|H9P8_{X`r&*)CvszX9($A+tK=C?W}FT9q(@P} zq$csC9z|7bB&Ieu-ZK(2wSmHGf{5~tH9=+Tr`AFFyE$O44E6WqF=CP!;H)532&FCc zgIfVdG9!EDaZx*W8gd!}33kUF(3!5p9=psjoDwPQmqf`KlN((_;&FV!n zFAF1ii#`&_Wael75Mh!3=$(df?<*STET7^JIz);SQXQs&Ujj_>iJ)Se2#3hY<5JO- z<2yer#KO?9{~Jkt@1BPt7_SkE6h}=39n8TW91;?RaSBmUa9HCc$3H`YW2T4X=6#FTxp?bzYj3Y}3Xwc0ULqyqgJ~fQ}k-S>+Vs zNkgD1i`wcJk_fD$&DHMhBEt(xHN%uN?vhZ7C?D4=++vFLz42%@20;c(IQd!st zR-5BOPqbv$oGGv+z_in{aCad%LxvLKN!V4*64y3fUO!PuVz3pQ==*1lA4y3M&%yl5 zvR>v5vF`W=hve&Ff>sb2BvAy(+6RVsbP+K>h>Kw)t9m&fKY5xJ7>sz@9H^su#n z0vUq{xY@rph`O^J$deyQJusPRzmrhy?*HO7XP)h&wG@-lk|T6)YfWoMTf+ULv2+%YVo^9tg@Kjgo|QWn zgrr(yo4G+n`5k!&$0^RExSaWu3GS%?CzTxw)kZt-_z;GDx&`7uh>V9sbv&x*K+S4h zayTSL*nI%mQl?g}`4>Vq$ao~0G)lfg(Fd3o>8yJHy$WVDSUI7-wEaD+V3QJ)qG1gQ zsZHtL((wzXYNk0mhyW-32z=G=EL8AMX-pfO3FB@HX8LQm3vkpXGpK@VtusQH&1xTK zt@e81R7uhdRMEb!Uuqi~sM+@NbPcNUVaM9UZ1v>mqzDvYuZm5`GHmKfGhzPfn;XoZ ztky4<$7%4s)lS~d*>iNKTC^4{B$1S^!`A&`yM1;URYRkxwp)t}(k`+*va8K&s#2z4 zDyT|INsvOr71{t3UbbWkC-U0t;ItyV1yoR9wiu&Kc!%och$n4)3YU@Ozok=#Q?lsig05rV2m}f5!dco%0DXxYXc6sNyU^*8Cu1eB}>|oZ~(kT@U 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 literal 0 HcmV?d00001 diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index f6c61c89e..3878cc0cd 100644 --- a/charts/postgres-operator/values.yaml +++ b/charts/postgres-operator/values.yaml @@ -1,7 +1,7 @@ image: registry: registry.opensource.zalan.do repository: acid/postgres-operator - tag: v1.7.1 + tag: v1.8.0 pullPolicy: "IfNotPresent" # Optionally specify an array of imagePullSecrets. @@ -38,7 +38,7 @@ configGeneral: # Select if setup uses endpoints (default), or configmaps to manage leader (DCS=k8s) # kubernetes_use_configmaps: false # Spilo docker image - docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p4 + docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p5 # min number of instances in Postgres cluster. -1 = no limit min_instances: -1 # max number of instances in Postgres cluster. -1 = no limit @@ -313,7 +313,7 @@ configAwsOrGcp: # configure K8s cron job managed by the operator configLogicalBackup: # image for pods of the logical backup job (example runs pg_dumpall) - logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.7.1" + logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.8.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 aa08f549e..aea4ec605 100644 --- a/docs/administrator.md +++ b/docs/administrator.md @@ -1286,7 +1286,7 @@ make docker # build in image in minikube docker env eval $(minikube docker-env) -docker build -t registry.opensource.zalan.do/acid/postgres-operator-ui:v1.7.1 . +docker build -t registry.opensource.zalan.do/acid/postgres-operator-ui:v1.8.0 . # apply UI manifests next to a running Postgres Operator kubectl apply -f manifests/ diff --git a/docs/quickstart.md b/docs/quickstart.md index 7049a6ef9..601d3ba3b 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -85,20 +85,25 @@ oc create -f manifests/operator-service-account-rbac-openshift.yaml ### Helm chart -Alternatively, the operator can be installed by using the provided [Helm](https://helm.sh/) -chart which saves you the manual steps. Clone this repo and change directory to -the repo root. With Helm v3 installed you should be able to run: +Alternatively, the operator can be installed by using the provided +[Helm](https://helm.sh/) chart which saves you the manual steps. The charts +for both the Postgres Operator and its UI are hosted via the `gh-pages` branch. +They only work only with Helm v3. Helm v2 support was dropped with v1.8.0. ```bash -helm install postgres-operator ./charts/postgres-operator +# add repo for postgres-operator +helm repo add postgres-operator-charts https://opensource.zalando.com/postgres-operator/charts/postgres-operator + +# install the postgres-operator +helm install postgres-operator postgres-operator-charts/postgres-operator + +# add repo for postgres-operator-ui +helm repo add postgres-operator-ui-charts https://opensource.zalando.com/postgres-operator/charts/postgres-operator-ui + +# install the postgres-operator-ui +helm install postgres-operator-ui postgres-operator-ui-charts/postgres-ui-operator ``` -The chart works with both Helm 2 and Helm 3. The `crd-install` hook from v2 will -be skipped with warning when using v3. Documentation for installing applications -with Helm 2 can be found in the [v2 docs](https://v2.helm.sh/docs/). - -The chart is also hosted at: https://opensource.zalando.com/postgres-operator/charts/postgres-operator/ - ## Check if Postgres Operator is running Starting the operator may take a few seconds. Check if the operator pod is diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md index 08cb37e03..e4e64cc32 100644 --- a/docs/reference/operator_parameters.md +++ b/docs/reference/operator_parameters.md @@ -679,7 +679,7 @@ grouped under the `logical_backup` key. runs `pg_dumpall` on a replica if possible and uploads compressed results to an S3 bucket under the key `/spilo/pg_cluster_name/cluster_k8s_uuid/logical_backups`. The default image is the same image built with the Zalando-internal CI - pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.7.1" + pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.8.0" * **logical_backup_google_application_credentials** Specifies the path of the google cloud service account json file. Default is empty. diff --git a/go.mod b/go.mod index 0d46daeec..26e629beb 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/golang/mock v1.6.0 github.com/lib/pq v1.10.4 github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d + github.com/pkg/errors v0.9.1 github.com/r3labs/diff v1.1.0 github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.0 @@ -44,7 +45,6 @@ require ( github.com/moby/spdystream v0.2.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.1 // indirect - github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect golang.org/x/mod v0.5.1 // indirect diff --git a/kubectl-pg/go.mod b/kubectl-pg/go.mod index 954b99940..d82b2392f 100644 --- a/kubectl-pg/go.mod +++ b/kubectl-pg/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/spf13/cobra v1.2.1 github.com/spf13/viper v1.9.0 - github.com/zalando/postgres-operator v1.7.1 + github.com/zalando/postgres-operator v1.8.0 k8s.io/api v0.22.4 k8s.io/apiextensions-apiserver v0.22.4 k8s.io/apimachinery v0.22.4 diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml index 26e404e6d..e2d798a94 100644 --- a/manifests/complete-postgres-manifest.yaml +++ b/manifests/complete-postgres-manifest.yaml @@ -10,7 +10,7 @@ metadata: # "delete-date": "2020-08-31" # can only be deleted on that day if "delete-date "key is configured # "delete-clustername": "acid-test-cluster" # can only be deleted when name matches if "delete-clustername" key is configured spec: - dockerImage: registry.opensource.zalan.do/acid/spilo-14:2.1-p4 + dockerImage: registry.opensource.zalan.do/acid/spilo-14:2.1-p5 teamId: "acid" numberOfInstances: 2 users: # Application/Robot users diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index 36dd092c2..64e01fb50 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -34,7 +34,7 @@ data: # default_memory_request: 100Mi # delete_annotation_date_key: delete-date # delete_annotation_name_key: delete-clustername - docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p4 + docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p5 # downscaler_annotations: "deployment-time,downscaler/*" # enable_admin_role_for_users: "true" # enable_crd_registration: "true" @@ -71,7 +71,7 @@ data: # kube_iam_role: "" # kubernetes_use_configmaps: "false" # log_s3_bucket: "" - logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.7.1" + logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.8.0" # logical_backup_google_application_credentials: "" logical_backup_job_prefix: "logical-backup-" logical_backup_provider: "s3" diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml index 99184dd17..d5594f6d4 100644 --- a/manifests/operatorconfiguration.crd.yaml +++ b/manifests/operatorconfiguration.crd.yaml @@ -66,7 +66,7 @@ spec: type: string docker_image: type: string - default: "registry.opensource.zalan.do/acid/spilo-14:2.1-p4" + default: "registry.opensource.zalan.do/acid/spilo-14:2.1-p5" enable_crd_registration: type: boolean default: true @@ -448,7 +448,7 @@ spec: properties: logical_backup_docker_image: type: string - default: "registry.opensource.zalan.do/acid/logical-backup:v1.7.1" + default: "registry.opensource.zalan.do/acid/logical-backup:v1.8.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 eddd44650..f06ba50e6 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:v1.7.1 + image: registry.opensource.zalan.do/acid/postgres-operator:v1.8.0 imagePullPolicy: IfNotPresent resources: requests: diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index 5cef7a353..d2e42e4f8 100644 --- a/manifests/postgresql-operator-default-configuration.yaml +++ b/manifests/postgresql-operator-default-configuration.yaml @@ -3,7 +3,7 @@ kind: OperatorConfiguration metadata: name: postgresql-operator-default-configuration configuration: - docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p4 + docker_image: registry.opensource.zalan.do/acid/spilo-14:2.1-p5 # enable_crd_registration: true # crd_categories: # - all @@ -144,7 +144,7 @@ configuration: # wal_gs_bucket: "" # wal_s3_bucket: "" logical_backup: - logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.7.1" + logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.8.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 e64b290ec..029685729 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -38,7 +38,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur result.EnableSpiloWalPathCompat = fromCRD.EnableSpiloWalPathCompat result.EtcdHost = fromCRD.EtcdHost result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps - result.DockerImage = util.Coalesce(fromCRD.DockerImage, "registry.opensource.zalan.do/acid/spilo-14:2.1-p4") + result.DockerImage = util.Coalesce(fromCRD.DockerImage, "registry.opensource.zalan.do/acid/spilo-14:2.1-p5") result.Workers = util.CoalesceUInt32(fromCRD.Workers, 8) result.MinInstances = fromCRD.MinInstances result.MaxInstances = fromCRD.MaxInstances @@ -165,7 +165,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, "registry.opensource.zalan.do/acid/logical-backup:v1.7.1") + result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "registry.opensource.zalan.do/acid/logical-backup:v1.8.0") result.LogicalBackupProvider = util.Coalesce(fromCRD.LogicalBackup.BackupProvider, "s3") result.LogicalBackupS3Bucket = fromCRD.LogicalBackup.S3Bucket result.LogicalBackupS3Region = fromCRD.LogicalBackup.S3Region diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 06b55bbd1..4d88db85d 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -122,7 +122,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:"registry.opensource.zalan.do/acid/logical-backup:v1.7.1"` + LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"registry.opensource.zalan.do/acid/logical-backup:v1.8.0"` LogicalBackupProvider string `name:"logical_backup_provider" default:"s3"` LogicalBackupS3Bucket string `name:"logical_backup_s3_bucket" default:""` LogicalBackupS3Region string `name:"logical_backup_s3_region" default:""` @@ -161,7 +161,7 @@ type Config struct { WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to' KubernetesUseConfigMaps bool `name:"kubernetes_use_configmaps" default:"false"` EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS - DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-14:2.1-p4"` + DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-14:2.1-p5"` SidecarImages map[string]string `name:"sidecar_docker_images"` // deprecated in favour of SidecarContainers SidecarContainers []v1.Container `name:"sidecars"` PodServiceAccountName string `name:"pod_service_account_name" default:"postgres-pod"` diff --git a/ui/manifests/deployment.yaml b/ui/manifests/deployment.yaml index b2af47790..18d33d323 100644 --- a/ui/manifests/deployment.yaml +++ b/ui/manifests/deployment.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: postgres-operator-ui containers: - name: "service" - image: registry.opensource.zalan.do/acid/postgres-operator-ui:v1.7.1 + image: registry.opensource.zalan.do/acid/postgres-operator-ui:v1.8.0 ports: - containerPort: 8081 protocol: "TCP"