From ec6799f34adafaa4b5b94ea05fee20e9fafc90bf Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Fri, 12 Jan 2018 14:56:14 +0100 Subject: [PATCH] Overwrite scalyr api key if the relevant env variable is present in the operator pod --- pkg/controller/controller.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 7992e4d16..5e1638e24 100644 --- 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() {