Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
postgres-operator
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
zalando
postgres-operator
Commits
1352c4a5
Unverified
Commit
1352c4a5
authored
May 24, 2018
by
zerg-junior
Committed by
GitHub
May 24, 2018
Browse files
Options
Downloads
Plain Diff
Merge pull request #302 from zalando-incubator/fix-etcd-host-default
Fix etcd_host default
parents
97d1bde5
32a1456a
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
pkg/util/config/config.go
+2
-2
2 additions, 2 deletions
pkg/util/config/config.go
with
2 additions
and
2 deletions
pkg/util/config/config.go
+
2
−
2
View file @
1352c4a5
...
...
@@ -69,7 +69,7 @@ type Config struct {
Scalyr
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:"
etcd-client.default.svc.cluster.local:2379"`
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/spiloprivate-9.6:1.2-p4"`
// default name `operator` enables backward compatibility with the older ServiceAccountName field
PodServiceAccountName
string
`name:"pod_service_account_name" default:"operator"`
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment