remove scalyr sidecar

pkg/apis/acid.zalan.do/v1/operator_configuration_type.go

@@ -136,17 +136,6 @@ type LoggingRESTAPIConfiguration struct {
 	ClusterHistoryEntries int `json:"cluster_history_entries,omitempty"`
 }
 
-// ScalyrConfiguration defines the configuration for ScalyrAPI
-type ScalyrConfiguration struct {
-	ScalyrAPIKey        string `json:"scalyr_api_key,omitempty"`
-	ScalyrImage         string `json:"scalyr_image,omitempty"`
-	ScalyrServerURL     string `json:"scalyr_server_url,omitempty"`
-	ScalyrCPURequest    string `json:"scalyr_cpu_request,omitempty"`
-	ScalyrMemoryRequest string `json:"scalyr_memory_request,omitempty"`
-	ScalyrCPULimit      string `json:"scalyr_cpu_limit,omitempty"`
-	ScalyrMemoryLimit   string `json:"scalyr_memory_limit,omitempty"`
-}
-
 // OperatorConfigurationData defines the operation config
 type OperatorConfigurationData struct {
 	EtcdHost                   string                             `json:"etcd_host,omitempty"`
@@ -168,7 +157,6 @@ type OperatorConfigurationData struct {
 	OperatorDebug              OperatorDebugConfiguration         `json:"debug"`
 	TeamsAPI                   TeamsAPIConfiguration              `json:"teams_api"`
 	LoggingRESTAPI             LoggingRESTAPIConfiguration        `json:"logging_rest_api"`
-	Scalyr                     ScalyrConfiguration                `json:"scalyr"`
 	LogicalBackup              OperatorLogicalBackupConfiguration `json:"logical_backup"`
 }
 

pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go

@@ -230,7 +230,6 @@ func (in *OperatorConfigurationData) DeepCopyInto(out *OperatorConfigurationData
 	out.OperatorDebug = in.OperatorDebug
 	in.TeamsAPI.DeepCopyInto(&out.TeamsAPI)
 	out.LoggingRESTAPI = in.LoggingRESTAPI
-	out.Scalyr = in.Scalyr
 	out.LogicalBackup = in.LogicalBackup
 	return
 }
@@ -683,22 +682,6 @@ func (in *Resources) DeepCopy() *Resources {
 	return out
 }
 
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ScalyrConfiguration) DeepCopyInto(out *ScalyrConfiguration) {
-	*out = *in
-	return
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScalyrConfiguration.
-func (in *ScalyrConfiguration) DeepCopy() *ScalyrConfiguration {
-	if in == nil {
-		return nil
-	}
-	out := new(ScalyrConfiguration)
-	in.DeepCopyInto(out)
-	return out
-}
-
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Sidecar) DeepCopyInto(out *Sidecar) {
 	*out = *in

pkg/cluster/k8sres.go

@@ -745,9 +745,6 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
 
 		}
 
-		// controller adjusts the Scalyr sidecar request at operator startup
-		// as this sidecar is managed separately
-
 		// adjust sidecar containers defined for that particular cluster
 		for _, sidecar := range spec.Sidecars {
 
@@ -849,23 +846,6 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
 	// resolve conflicts between operator-global and per-cluster sidecars
 	sideCars := c.mergeSidecars(spec.Sidecars)
 
-	resourceRequirementsScalyrSidecar := makeResources(
-		c.OpConfig.ScalyrCPURequest,
-		c.OpConfig.ScalyrMemoryRequest,
-		c.OpConfig.ScalyrCPULimit,
-		c.OpConfig.ScalyrMemoryLimit,
-	)
-
-	// generate scalyr sidecar container
-	if scalyrSidecar :=
-		generateScalyrSidecarSpec(c.Name,
-			c.OpConfig.ScalyrAPIKey,
-			c.OpConfig.ScalyrServerURL,
-			c.OpConfig.ScalyrImage,
-			&resourceRequirementsScalyrSidecar, c.logger); scalyrSidecar != nil {
-		sideCars = append(sideCars, *scalyrSidecar)
-	}
-
 	// generate sidecar containers
 	if sidecarContainers, err = generateSidecarContainers(sideCars, volumeMounts, defaultResources,
 		c.OpConfig.SuperUsername, c.credentialSecretName(c.OpConfig.SuperUsername), c.logger); err != nil {
@@ -949,35 +929,6 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
 	return statefulSet, nil
 }
 
-func generateScalyrSidecarSpec(clusterName, APIKey, serverURL, dockerImage string,
-	containerResources *acidv1.Resources, logger *logrus.Entry) *acidv1.Sidecar {
-	if APIKey == "" || dockerImage == "" {
-		if APIKey == "" && dockerImage != "" {
-			logger.Warning("Not running Scalyr sidecar: SCALYR_API_KEY must be defined")
-		}
-		return nil
-	}
-	scalarSpec := &acidv1.Sidecar{
-		Name:        "scalyr-sidecar",
-		DockerImage: dockerImage,
-		Env: []v1.EnvVar{
-			{
-				Name:  "SCALYR_API_KEY",
-				Value: APIKey,
-			},
-			{
-				Name:  "SCALYR_SERVER_HOST",
-				Value: clusterName,
-			},
-		},
-		Resources: *containerResources,
-	}
-	if serverURL != "" {
-		scalarSpec.Env = append(scalarSpec.Env, v1.EnvVar{Name: "SCALYR_SERVER_URL", Value: serverURL})
-	}
-	return scalarSpec
-}
-
 // mergeSidecar merges globally-defined sidecars with those defined in the cluster manifest
 func (c *Cluster) mergeSidecars(sidecars []acidv1.Sidecar) []acidv1.Sidecar {
 	globalSidecarsToSkip := map[string]bool{}

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
 }

pkg/util/config/config.go

@@ -57,17 +57,6 @@ type Auth struct {
 	ReplicationUsername           string              `name:"replication_username" default:"standby"`
 }
 
-// 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:""`
-	ScalyrServerURL     string `name:"scalyr_server_url" default:"https://upload.eu.scalyr.com"`
-	ScalyrCPURequest    string `name:"scalyr_cpu_request" default:"100m"`
-	ScalyrMemoryRequest string `name:"scalyr_memory_request" default:"50Mi"`
-	ScalyrCPULimit      string `name:"scalyr_cpu_limit" default:"1"`
-	ScalyrMemoryLimit   string `name:"scalyr_memory_limit" default:"1Gi"`
-}
-
 // LogicalBackup
 type LogicalBackup struct {
 	LogicalBackupSchedule    string `name:"logical_backup_schedule" default:"30 00 * * *"`
@@ -80,7 +69,6 @@ type Config struct {
 	CRD
 	Resources
 	Auth
-	Scalyr
 	LogicalBackup
 
 	WatchedNamespace string            `name:"watched_namespace"`    // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to'