Fix disabling database access and teams API via command-line options. (zalando#351)

alexeyklyukin · sdudoladov · commit f27833b5eb2d · 2018-07-27T10:24:05.000+02:00
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -114,10 +114,10 @@ func (c *Controller) modifyConfigFromEnvironment() {
 	c.opConfig.WatchedNamespace = c.getEffectiveNamespace(os.Getenv("WATCHED_NAMESPACE"), c.opConfig.WatchedNamespace)
 
 	if c.config.NoDatabaseAccess {
-		c.opConfig.EnableDBAccess = c.config.NoDatabaseAccess
+		c.opConfig.EnableDBAccess = false
 	}
 	if c.config.NoTeamsAPI {
-		c.opConfig.EnableTeamsAPI = c.config.NoTeamsAPI
+		c.opConfig.EnableTeamsAPI = false
 	}
 	scalyrAPIKey := os.Getenv("SCALYR_API_KEY")
 	if scalyrAPIKey != "" {

Original file line number	Diff line number	Diff line change
`@@ -114,10 +114,10 @@ func (c *Controller) modifyConfigFromEnvironment() {`
`114`	`114`	`c.opConfig.WatchedNamespace = c.getEffectiveNamespace(os.Getenv("WATCHED_NAMESPACE"), c.opConfig.WatchedNamespace)`
`115`	`115`
`116`	`116`	`if c.config.NoDatabaseAccess {`
`117`		`- c.opConfig.EnableDBAccess = c.config.NoDatabaseAccess`
	`117`	`+ c.opConfig.EnableDBAccess = false`
`118`	`118`	`}`
`119`	`119`	`if c.config.NoTeamsAPI {`
`120`		`- c.opConfig.EnableTeamsAPI = c.config.NoTeamsAPI`
	`120`	`+ c.opConfig.EnableTeamsAPI = false`
`121`	`121`	`}`
`122`	`122`	`scalyrAPIKey := os.Getenv("SCALYR_API_KEY")`
`123`	`123`	`if scalyrAPIKey != "" {`