public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-09-30 16:27:28 +02:00
Code Issues Projects Releases Wiki Activity

Make env var overwrite configmap setting for watching namespaces

Browse Source
This commit is contained in:
Sergey Dudoladov
2018-02-06 16:12:47 +01:00
parent 0ef801f4e0
commit 8b7bbde06e
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/controller.go
+14 -2
View File
@@ -97,9 +97,21 @@ func (c *Controller) initOperatorConfig() {
c.logger.Infoln("no ConfigMap specified. Loading default values")
}
if configMapData["watched_namespace"] == "" { // Namespace in ConfigMap has priority over env var
configMapData["watched_namespace"] = c.config.Namespace
// env var takes priority over the same param from the operator ConfigMap
watchedNamespace := os.Getenv("WATCHED_NAMESPACE")
if watchedNamespace != "" {
c.logger.Infof("Watch the %q namespace specified in the env variable WATCHED_NAMESPACE\n", watchedNamespace)
configMapData["watched_namespace"] = watchedNamespace
}
if configMapData["watched_namespace"] == "" {
c.logger.Infoln("No namespace to watch specified. Fall back to watching the 'default' namespace.")
configMapData["watched_namespace"] = v1.NamespaceDefault
}
// display the actual namespace in case someone checks the value manually
os.Setenv("WATCHED_NAMESPACE", configMapData["watched_namespace"])
if c.config.NoDatabaseAccess {
configMapData["enable_database_access"] = "false"
}