diff --git a/.github/workflows/run_tests.yaml b/.github/workflows/run_tests.yaml index ebcdfedf6..d66514a5c 100644 --- a/.github/workflows/run_tests.yaml +++ b/.github/workflows/run_tests.yaml @@ -22,7 +22,7 @@ jobs: - name: Run unit tests run: go test -race -covermode atomic -coverprofile=coverage.out ./... - name: Convert coverage to lcov - uses: jandelgado/gcov2lcov-action@v1.0.5 + uses: jandelgado/gcov2lcov-action@v1.0.8 - name: Coveralls uses: coverallsapp/github-action@master with: diff --git a/charts/postgres-operator/postgres-operator-1.6.0.tgz b/charts/postgres-operator/postgres-operator-1.6.0.tgz index ce19d5882..b57f99027 100644 Binary files a/charts/postgres-operator/postgres-operator-1.6.0.tgz and b/charts/postgres-operator/postgres-operator-1.6.0.tgz differ diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml index 2ca1434e7..773f311d8 100644 --- a/charts/postgres-operator/values-crd.yaml +++ b/charts/postgres-operator/values-crd.yaml @@ -249,6 +249,11 @@ configAwsOrGcp: configLogicalBackup: # image for pods of the logical backup job (example runs pg_dumpall) logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.0" + # path of google cloud service account json file + # logical_backup_google_application_credentials: "" + + # storage provider - either "s3" or "gcs" + logical_backup_provider: "s3" # S3 Access Key ID logical_backup_s3_access_key_id: "" # S3 bucket to store backup results diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index 3a84fae59..39fdb9929 100644 --- a/charts/postgres-operator/values.yaml +++ b/charts/postgres-operator/values.yaml @@ -240,6 +240,11 @@ configAwsOrGcp: configLogicalBackup: # image for pods of the logical backup job (example runs pg_dumpall) logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v.1.6.0" + # path of google cloud service account json file + # logical_backup_google_application_credentials: "" + + # storage provider - either "s3" or "gcs" + logical_backup_provider: "s3" # S3 Access Key ID logical_backup_s3_access_key_id: "" # S3 bucket to store backup results diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index ce5d47b62..848389d63 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -63,6 +63,8 @@ data: # kube_iam_role: "" # log_s3_bucket: "" logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.0" + # logical_backup_google_application_credentials: "" + logical_backup_provider: "s3" # logical_backup_s3_access_key_id: "" logical_backup_s3_bucket: "my-bucket-url" # logical_backup_s3_region: "" diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index efc6052da..69e53daeb 100644 --- a/manifests/postgresql-operator-default-configuration.yaml +++ b/manifests/postgresql-operator-default-configuration.yaml @@ -116,6 +116,8 @@ configuration: # wal_s3_bucket: "" logical_backup: logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v.1.6.0" + # logical_backup_google_application_credentials: "" + logical_backup_provider: "s3" # logical_backup_s3_access_key_id: "" logical_backup_s3_bucket: "my-bucket-url" # logical_backup_s3_endpoint: ""