From b412a831d67df76cbd1489968479483a00c1fa36 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Fri, 16 Feb 2018 12:30:07 +0100 Subject: [PATCH] Remove the second namespace prefix from the operator configmap name --- cmd/main.go | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index bdfdf862c..5c8aadd8f 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -30,20 +30,14 @@ 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() {