remove scalyr sidecar

pkg/controller/controller.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 
 	"github.com/sirupsen/logrus"
-	"k8s.io/api/core/v1"
+	v1 "k8s.io/api/core/v1"
 	rbacv1beta1 "k8s.io/api/rbac/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -120,15 +120,6 @@ func (c *Controller) initOperatorConfig() {
 			c.opConfig.DefaultMemoryRequest = c.opConfig.DefaultMemoryLimit
 		}
 
-		isSmaller, err = util.RequestIsSmallerThanLimit(c.opConfig.ScalyrMemoryRequest, c.opConfig.ScalyrMemoryLimit)
-		if err != nil {
-			panic(err)
-		}
-		if isSmaller {
-			c.logger.Warningf("The memory request of %v for the Scalyr sidecar container is increased to match the memory limit of %v.", c.opConfig.ScalyrMemoryRequest, c.opConfig.ScalyrMemoryLimit)
-			c.opConfig.ScalyrMemoryRequest = c.opConfig.ScalyrMemoryLimit
-		}
-
 		// generateStatefulSet adjusts values for individual Postgres clusters
 	}
 
@@ -143,10 +134,6 @@ func (c *Controller) modifyConfigFromEnvironment() {
 	if c.config.NoTeamsAPI {
 		c.opConfig.EnableTeamsAPI = false
 	}
-	scalyrAPIKey := os.Getenv("SCALYR_API_KEY")
-	if scalyrAPIKey != "" {
-		c.opConfig.ScalyrAPIKey = scalyrAPIKey
-	}
 }
 
 // warningOnDeprecatedParameters emits warnings upon finding deprecated parmaters

pkg/controller/operator_config.go

@@ -122,14 +122,5 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
 	result.RingLogLines = fromCRD.LoggingRESTAPI.RingLogLines
 	result.ClusterHistoryEntries = fromCRD.LoggingRESTAPI.ClusterHistoryEntries
 
-	// Scalyr config
-	result.ScalyrAPIKey = fromCRD.Scalyr.ScalyrAPIKey
-	result.ScalyrImage = fromCRD.Scalyr.ScalyrImage
-	result.ScalyrServerURL = fromCRD.Scalyr.ScalyrServerURL
-	result.ScalyrCPURequest = fromCRD.Scalyr.ScalyrCPURequest
-	result.ScalyrMemoryRequest = fromCRD.Scalyr.ScalyrMemoryRequest
-	result.ScalyrCPULimit = fromCRD.Scalyr.ScalyrCPULimit
-	result.ScalyrMemoryLimit = fromCRD.Scalyr.ScalyrMemoryLimit
-
 	return result
 }