diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index db1d2aaf3..7c4e9cb7a 100644 --- a/charts/postgres-operator/values.yaml +++ b/charts/postgres-operator/values.yaml @@ -14,7 +14,7 @@ podAnnotations: {} podLabels: {} # config shared from ConfigMap and CRD -docker_image: registry.opensource.zalan.do/acid/spilo-cdp-11:1.5-p70 +docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 repair_period: 5m resync_period: 5m spilo_privileged: false diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index 17830c41f..9741923ee 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: postgres-operator -data: +data: watched_namespace: "*" # listen to all namespaces cluster_labels: application:spilo cluster_name_label: version @@ -10,7 +10,7 @@ data: debug_logging: "true" workers: "4" - docker_image: registry.opensource.zalan.do/acid/spilo-cdp-11:1.5-p70 + docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 pod_service_account_name: "zalando-postgres-operator" secret_name_template: '{username}.{cluster}.credentials' super_username: postgres diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index 2bbb22103..26e7e031e 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-cdp-11:1.5-p42 + docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 workers: 4 min_instances: -1 max_instances: -1 diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index b2374e042..165bb3ce2 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -75,7 +75,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-cdp-10:1.4-p8"` + DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-11:1.5-p7"` 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"`