From b3239abf787c3b08e1002fe72ddbfc359bd50cab Mon Sep 17 00:00:00 2001 From: wmuldergov <126018319+wmuldergov@users.noreply.github.com> Date: Wed, 19 Jun 2024 15:40:06 -0700 Subject: [PATCH 1/3] fix: Add s3UriStyle to Datasource To restore from a OCIO s3 bucket, this must be set to path otherwise it will use host by default. --- charts/crunchy-postgres/templates/PostgresCluster.yaml | 1 + charts/crunchy-postgres/values.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/charts/crunchy-postgres/templates/PostgresCluster.yaml b/charts/crunchy-postgres/templates/PostgresCluster.yaml index e2b31d1..890a19a 100644 --- a/charts/crunchy-postgres/templates/PostgresCluster.yaml +++ b/charts/crunchy-postgres/templates/PostgresCluster.yaml @@ -90,6 +90,7 @@ spec: name: {{ .Values.dataSource.secretName }} global: repo2-path: {{ .Values.dataSource.repo.path }} + repo2-s3-uri-style: {{ .Values.dataSource.repo.s3UriStyle }} repo: name: {{ .Values.dataSource.repo.name }} s3: diff --git a/charts/crunchy-postgres/values.yaml b/charts/crunchy-postgres/values.yaml index 6959ac5..d2bdff2 100644 --- a/charts/crunchy-postgres/values.yaml +++ b/charts/crunchy-postgres/values.yaml @@ -40,6 +40,8 @@ dataSource: secretName: s3-pgbackrest repo: name: repo2 + # s3UriStyle is host or path + s3UriStyle: path path: "/habackup" s3: bucket: "bucketName" From 68cfa33a0e178f77b71c04e2aacd29c229234fda Mon Sep 17 00:00:00 2001 From: Mulder Date: Thu, 20 Jun 2024 08:03:29 -0700 Subject: [PATCH 2/3] fix: Update the reference for stanza --- charts/crunchy-postgres/templates/PostgresCluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/crunchy-postgres/templates/PostgresCluster.yaml b/charts/crunchy-postgres/templates/PostgresCluster.yaml index 890a19a..4728a81 100644 --- a/charts/crunchy-postgres/templates/PostgresCluster.yaml +++ b/charts/crunchy-postgres/templates/PostgresCluster.yaml @@ -97,7 +97,7 @@ spec: bucket: {{ .Values.dataSource.repo.s3.bucket }} endpoint: {{ .Values.dataSource.repo.s3.endpoint }} region: {{ .Values.dataSource.repo.s3.region }} - stanza: {{ .Values.dataSource.stanza }} + stanza: {{ .Values.dataSource.repo.stanza }} {{ end }} backups: From 927ce650333411c1d138c3b3d386a0e106ffe7c3 Mon Sep 17 00:00:00 2001 From: wmuldergov <126018319+wmuldergov@users.noreply.github.com> Date: Tue, 1 Oct 2024 15:48:26 -0700 Subject: [PATCH 3/3] Remove crunchyImage comment for PostGIS --- charts/crunchy-postgres/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/crunchy-postgres/values.yaml b/charts/crunchy-postgres/values.yaml index d2bdff2..d492807 100644 --- a/charts/crunchy-postgres/values.yaml +++ b/charts/crunchy-postgres/values.yaml @@ -1,9 +1,8 @@ fullnameOverride: crunchy-postgres crunchyImage: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default -#crunchyImage: artifacts.developer.gov.bc.ca/bcgov-docker-local/crunchy-postgres-gis:ubi8-15.2-3.3-0 # use this image for POSTGIS postgresVersion: 15 -#postGISVersion: '3.3' # use this version of POSTGIS. both crunchyImage and this property needs to have valid values for POSTGIS to be enabled. +#postGISVersion: '3.3' # use this version of POSTGIS. imagePullPolicy: IfNotPresent # enable to bootstrap a standby cluster from backup. Then disable to promote this standby to primary