Remove the default for the Scalyr image

Now the image needs to be specified explicitly to enable log shipping to Scalyr. This removes the problem of having to generate the config file or publish our agent image repository.
zalando · Dec 20, 2017 · 3db68fb · 3db68fb
1 parent 175fecc
commit 3db68fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go
@@ -435,7 +435,7 @@ func (c *Cluster) generatePodTemplate(
 		Tolerations:                   c.tolerations(tolerationsSpec),
 	}
 
-	if c.OpConfig.ScalyrAPIKey != "" {
+	if c.OpConfig.ScalyrAPIKey != "" && c.OpConfig.ScalyrImage != "" {
 		podSpec.Containers = append(
 			podSpec.Containers,
 			v1.Container{

diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go
@@ -53,7 +53,7 @@ type Auth struct {
 // Scalyr holds the configuration for the Scalyr Agent sidecar for log shipping:
 type Scalyr struct {
 	ScalyrAPIKey        string `name:"scalyr_api_key" default:""`
-	ScalyrImage         string `name:"scalyr_image" default:"registry.opensource.zalan.do/acid/spilo-sidecar-scalyr:cpr-1-18"`
+	ScalyrImage         string `name:"scalyr_image" default:""`
 	ScalyrCPURequest    string `name:"scalyr_cpu_request" default:"100m"`
 	ScalyrMemoryRequest string `name:"scalyr_memory_request" default:"50Mi"`
 	ScalyrCPULimit      string `name:"scalyr_cpu_limit" default:"1"`