public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-01 13:10:25 +02:00
Code Issues Projects Releases Wiki Activity

merge with master and update image in e2e test

Browse Source
This commit is contained in:
Felix Kunde
2020-04-28 17:28:56 +02:00
parent 65fc09054b 1d009d9595
commit 13022fd6ca
13 changed files with 34 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/config/config.go
+1 -1
View File
@@ -111,7 +111,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-12:1.6-p2"`
DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115"`
// deprecated in favour of SidecarContainers
SidecarImages map[string]string `name:"sidecar_docker_images"`
SidecarContainers []v1.Container `name:"sidecars"`