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

Merge pull request #236 from zalando-incubator/fix-config-map-namespace 

Remove the second namespace prefix from the operator configmap name
This commit is contained in:
zerg-junior 2018-02-16 12:37:41 +01:00 committed by GitHub
parent 04557922c0 b412a831d6
commit 7b74da8713
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/main.go
View File

@ -30,21 +30,15 @@ func init() {
configMapRawName := os.Getenv("CONFIG_MAP_NAME")
if configMapRawName != "" {
operatorNamespace := spec.GetOperatorNamespace()
config.Namespace = operatorNamespace
namespacedConfigMapName := operatorNamespace + "/" + configMapRawName
log.Printf("Looking for the operator configmap at the same namespace the operator resides. Fully qualified configmap name: %v", namespacedConfigMapName)
err := config.ConfigMapName.Decode(namespacedConfigMapName)
err := config.ConfigMapName.Decode(configMapRawName)
if err != nil {
log.Fatalf("incorrect config map name: %v", namespacedConfigMapName)
log.Fatalf("incorrect config map name: %v", configMapRawName)
}
}
log.Printf("Fully qualified configmap name: %v", config.ConfigMapName)
}
}
func main() {
var err error