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

Merge branch 'master' into support-many-namespaces

Browse Source
This commit is contained in:
Sergey Dudoladov
2018-02-16 15:06:10 +01:00
parent 4c23917d42 c09968774b
commit 088bf70e7d
9 changed files with 245 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/controller.go
+4 -2
View File
@@ -101,8 +101,10 @@ func (c *Controller) initOperatorConfig() {
watchedNsEnvVar, isPresentInOperatorEnv := os.LookupEnv("WATCHED_NAMESPACE")
if (!isPresentInOperatorConfigMap) && (!isPresentInOperatorEnv) {
c.logger.Infoln("Neither the operator config map nor operator pod's environment define a namespace to watch. Fall back to watching the 'default' namespace.")
configMapData["watched_namespace"] = v1.NamespaceDefault
c.logger.Infof("No namespace to watch specified. By convention, the operator falls back to watching the namespace it is deployed to: '%v' \n", spec.GetOperatorNamespace())
configMapData["watched_namespace"] = spec.GetOperatorNamespace()
}
if (isPresentInOperatorConfigMap) && (!isPresentInOperatorEnv) {