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

Streamline handling of the watched_namespace param/envvar

This commit is contained in:
Sergey Dudoladov 2018-02-09 11:39:56 +01:00
parent c0bc8eaa6d
commit 066f11cbbd
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/controller/controller.go
View File

@ -97,20 +97,34 @@ func (c *Controller) initOperatorConfig() {
c.logger.Infoln("no ConfigMap specified. Loading default values") c.logger.Infoln("no ConfigMap specified. Loading default values")
} }
// by default, the operator listens to all namespaces watchedNsConfigMapVar, isPresentInOperatorConfigMap := configMapData["watched_namespace"]
if configMapData["watched_namespace"] == "" { watchedNsEnvVar, isPresentInOperatorEnv := os.LookupEnv("WATCHED_NAMESPACE")
c.logger.Infoln("The operator config map specifies no namespace to watch. Falling back to watching all namespaces.")
if (!isPresentInOperatorConfigMap) && (!isPresentInOperatorEnv) {
c.logger.Infoln("Neither the operator config map nor operator pod's environment define a namespace to watch. Default to watching all namespaces.")
configMapData["watched_namespace"] = v1.NamespaceAll configMapData["watched_namespace"] = v1.NamespaceAll
} }
watchedNsEnvVar, isPresentInEnv := os.LookupEnv("WATCHED_NAMESPACE") if (isPresentInOperatorConfigMap) && (!isPresentInOperatorEnv) {
if isPresentInEnv {
c.logger.Infoln("The WATCHED_NAMESPACE env variable takes priority over the same param from the operator configMap\n")
// special case: v1.NamespaceAll currently also evaluates to the empty string // special case: v1.NamespaceAll currently also evaluates to the empty string
// so when the env var is set to the empty string, use the default ns // so when the param evaluates to the empty string, we use the default ns
// since the meaning of this env var is only one namespace // since the meaning of the param is a single namespace and *not* all namespaces
if watchedNsConfigMapVar == "" {
c.logger.Infof("The watched namespace field in the operator config map evaluates to the empty string, falling back to watching the 'default' namespace.\n")
configMapData["watched_namespace"] = v1.NamespaceDefault
}
}
if isPresentInOperatorEnv {
if isPresentInOperatorConfigMap {
c.logger.Infof("Both WATCHED_NAMESPACE=%q env var and wacthed_namespace=%q field in operator config map are defined. The env variable takes priority over the configMap param\n", watchedNsEnvVar, watchedNsConfigMapVar)
}
// handle the empty string consistently
if watchedNsEnvVar == "" { if watchedNsEnvVar == "" {
c.logger.Infof("The WATCHED_NAMESPACE env var evaluates to the empty string, falling back to watching the 'default' namespace.\n", watchedNsEnvVar) c.logger.Infoln("The WATCHED_NAMESPACE env var evaluates to the empty string, falling back to watching the 'default' namespace")
configMapData["watched_namespace"] = v1.NamespaceDefault configMapData["watched_namespace"] = v1.NamespaceDefault
} else { } else {
c.logger.Infof("Watch the %q namespace specified in the env variable WATCHED_NAMESPACE\n", watchedNsEnvVar) c.logger.Infof("Watch the %q namespace specified in the env variable WATCHED_NAMESPACE\n", watchedNsEnvVar)