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

Rename the configmap 'namespace' entry to avoid confusion with the map's owm namespace

Browse Source
This commit is contained in:
Sergey Dudoladov
2018-02-06 15:09:00 +01:00
parent dcf637d4ea
commit ea84f9d577
7 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/controller.go
+2 -2
View File
@@ -97,8 +97,8 @@ func (c *Controller) initOperatorConfig() {
c.logger.Infoln("no ConfigMap specified. Loading default values")
}
if configMapData["namespace"] == "" { // Namespace in ConfigMap has priority over env var
configMapData["namespace"] = c.config.Namespace
if configMapData["watched_namespace"] == "" { // Namespace in ConfigMap has priority over env var
configMapData["watched_namespace"] = c.config.Namespace
}
if c.config.NoDatabaseAccess {
configMapData["enable_database_access"] = "false"