From 3d241aee23e7a7077d9a4fd44d50dd74deede569 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Wed, 3 Jul 2019 16:57:33 +0200 Subject: [PATCH] bump spilo version and use example for logical_backup_s3_bucket --- charts/postgres-operator/values-crd.yaml | 4 ++-- charts/postgres-operator/values.yaml | 4 ++-- manifests/complete-postgres-manifest.yaml | 2 +- manifests/configmap.yaml | 4 ++-- manifests/postgresql-operator-default-configuration.yaml | 4 ++-- pkg/util/config/config.go | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml index 387e852c5..1902d9b40 100644 --- a/charts/postgres-operator/values-crd.yaml +++ b/charts/postgres-operator/values-crd.yaml @@ -18,7 +18,7 @@ configGeneral: # etcd connection string for Patroni. Empty uses K8s-native DCS. etcd_host: "" # Spilo docker image - docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 + docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 # max number of instances in Postgres cluster. -1 = no limit min_instances: -1 # min number of instances in Postgres cluster. -1 = no limit @@ -183,7 +183,7 @@ configLogicalBackup: # image for pods of the logical backup job (example runs pg_dumpall) logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" # S3 bucket to store backup results - logical_backup_s3_bucket: "" + logical_backup_s3_bucket: "my-bucket-url" # automate creation of human users with teams API service configTeamsApi: diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index 384e47a0d..e13ad60de 100644 --- a/charts/postgres-operator/values.yaml +++ b/charts/postgres-operator/values.yaml @@ -18,7 +18,7 @@ configGeneral: # etcd connection string for Patroni. Empty uses K8s-native DCS. etcd_host: "" # Spilo docker image - docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 + docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 # max number of instances in Postgres cluster. -1 = no limit min_instances: "-1" # min number of instances in Postgres cluster. -1 = no limit @@ -178,7 +178,7 @@ configLogicalBackup: # image for pods of the logical backup job (example runs pg_dumpall) logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" # S3 bucket to store backup results - logical_backup_s3_bucket: "" + logical_backup_s3_bucket: "my-bucket-url" # automate creation of human users with teams API service configTeamsApi: diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml index 38f582281..3f9bd1d46 100644 --- a/manifests/complete-postgres-manifest.yaml +++ b/manifests/complete-postgres-manifest.yaml @@ -3,7 +3,7 @@ kind: postgresql metadata: name: acid-test-cluster spec: - dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.5-p8 + dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 init_containers: - name: date image: busybox diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index c721b33e8..274fbe3a6 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -19,7 +19,7 @@ data: # default_cpu_request: 100m # default_memory_limit: 1Gi # default_memory_request: 100Mi - docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 + docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 # enable_admin_role_for_users: "true" # enable_database_access: "true" enable_master_load_balancer: "true" @@ -34,7 +34,7 @@ data: # kube_iam_role: "" # log_s3_bucket: "" # logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" - # logical_backup_s3_bucket: "" + # logical_backup_s3_bucket: "my-bucket-url" # logical_backup_schedule: "30 00 * * *" master_dns_name_format: '{cluster}.{team}.staging.{hostedzone}' # master_pod_move_timeout: 10m diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index 5556d2728..f3c1530cb 100644 --- a/manifests/postgresql-operator-default-configuration.yaml +++ b/manifests/postgresql-operator-default-configuration.yaml @@ -4,7 +4,7 @@ metadata: name: postgresql-operator-default-configuration configuration: etcd_host: "" - docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 + docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9 max_instances: -1 min_instances: -1 resync_period: 30m @@ -72,7 +72,7 @@ configuration: logical_backup: logical_backup_schedule: "30 00 * * *" logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" - logical_backup_s3_bucket: "" + logical_backup_s3_bucket: "my-bucket-url" debug: debug_logging: true enable_database_access: true diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 661574368..1f80c82a4 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -85,7 +85,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' 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-11:1.5-p7"` + DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-11:1.5-p9"` Sidecars map[string]string `name:"sidecar_docker_images"` // default name `operator` enables backward compatibility with the older ServiceAccountName field PodServiceAccountName string `name:"pod_service_account_name" default:"operator"`