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

merge with master and resolve conflict

Browse Source
This commit is contained in:
Felix Kunde
2020-02-20 10:09:13 +01:00
parent 2afaa59719 742d7334a1
commit cf85db5d7a
43 changed files with 612 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/config/config.go
+1 -1
View File
@@ -110,7 +110,7 @@ type Config struct {
DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p16"`
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"`
PodServiceAccountName string `name:"pod_service_account_name" default:"postgres-pod"`
// value of this string must be valid JSON or YAML; see initPodServiceAccount
PodServiceAccountDefinition string `name:"pod_service_account_definition" default:""`
PodServiceAccountRoleBindingDefinition string `name:"pod_service_account_role_binding_definition" default:""`