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

Use '*' as an alias to denote all namespaces

This commit is contained in:
Sergey Dudoladov 2018-02-16 15:20:26 +01:00
parent 088bf70e7d
commit e3d2434420
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/controller/controller.go
View File

@ -109,11 +109,10 @@ func (c *Controller) initOperatorConfig() {
if (isPresentInOperatorConfigMap) && (!isPresentInOperatorEnv) { if (isPresentInOperatorConfigMap) && (!isPresentInOperatorEnv) {
// explicitly specify the policy for handling the empty string // explicitly specify the policy for handling all namespaces
// v1.NamespaceAll currently also evaluates to the empty string // note that '*' is not a valid namespace name
// so when the param is set to this value, we watch all ns if watchedNsConfigMapVar == "*" {
if watchedNsConfigMapVar == "" { c.logger.Infof("The watched namespace field in the operator config map evaluates to '*', meaning watching all namespaces.\n")
c.logger.Infof("The watched namespace field in the operator config map evaluates to the empty string, falling back to watching all namespaces.\n")
configMapData["watched_namespace"] = v1.NamespaceAll configMapData["watched_namespace"] = v1.NamespaceAll
} }
} }
@ -124,9 +123,9 @@ func (c *Controller) initOperatorConfig() {
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) 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 // handle all namespaces consistently
if watchedNsEnvVar == "" { if watchedNsEnvVar == "*" {
c.logger.Infoln("The WATCHED_NAMESPACE env var evaluates to the empty string, falling back to watching all namespaces") c.logger.Infof("The watched namespace field in the operator config map evaluates to '*', meaning watching all namespaces.\n")
configMapData["watched_namespace"] = v1.NamespaceAll configMapData["watched_namespace"] = v1.NamespaceAll
} 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)