public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into go-client-upgrade

This commit is contained in:
Oleksii Kliukin 2018-07-27 11:39:08 +02:00
parent d1c22d4a2e f27833b5eb
commit 130f06cea0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/controller.go
View File

@ -114,10 +114,10 @@ func (c *Controller) modifyConfigFromEnvironment() {
c.opConfig.WatchedNamespace = c.getEffectiveNamespace(os.Getenv("WATCHED_NAMESPACE"), c.opConfig.WatchedNamespace) c.opConfig.WatchedNamespace = c.getEffectiveNamespace(os.Getenv("WATCHED_NAMESPACE"), c.opConfig.WatchedNamespace)
if c.config.NoDatabaseAccess { if c.config.NoDatabaseAccess {
c.opConfig.EnableDBAccess = c.config.NoDatabaseAccess c.opConfig.EnableDBAccess = false
} }
if c.config.NoTeamsAPI { if c.config.NoTeamsAPI {
c.opConfig.EnableTeamsAPI = c.config.NoTeamsAPI c.opConfig.EnableTeamsAPI = false
} }
scalyrAPIKey := os.Getenv("SCALYR_API_KEY") scalyrAPIKey := os.Getenv("SCALYR_API_KEY")
if scalyrAPIKey != "" { if scalyrAPIKey != "" {