Merge pull request #205 from zalando-incubator/scalyr-api-key

Overwrite scalyr api key if the relevant env var is present in the operator pod
zalando · Jan 12, 2018 · 8c9033d · 8c9033d
2 parents 56359d2 + ec6799f
commit 8c9033d
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -2,6 +2,7 @@ package controller
 
 import (
 	"fmt"
+	"os"
 	"sync"
 
 	"github.com/Sirupsen/logrus"
@@ -107,6 +108,11 @@ func (c *Controller) initOperatorConfig() {
 	}
 
 	c.opConfig = config.NewFromMap(configMapData)
+
+	scalyrAPIKey := os.Getenv("SCALYR_API_KEY")
+	if scalyrAPIKey != "" {
+		c.opConfig.ScalyrAPIKey = scalyrAPIKey
+	}
 }
 
 func (c *Controller) initController() {