public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve generation of Scalyr container environment. (#346) 

* Improve generting of Scalyr container environment.

Avoid duplicating POD_NAME and POD_NAMESPACE that already bundled
every sidecar.

Do not complain on the lack of SCLALYR_SERVER_HOST, since it is set to
https://upload.eu.scalyr.com in the container we use.

Do not mentioned SCALYR_SERVER_HOST in the error messages, since it is
derived from the cluster name automatically.
This commit is contained in:
Oleksii Kliukin 2018-07-24 11:16:24 +02:00 committed by GitHub
parent 12871aad1a
commit 1a0e5357dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/cluster/k8sres.go
View File

@ -744,35 +744,16 @@ func getEffectiveDockerImage(globalDockerImage, clusterDockerImage string) strin
func generateScalyrSidecarSpec(clusterName, APIKey, serverURL, dockerImage string, func generateScalyrSidecarSpec(clusterName, APIKey, serverURL, dockerImage string,
containerResources *spec.Resources, logger *logrus.Entry) *spec.Sidecar { containerResources *spec.Resources, logger *logrus.Entry) *spec.Sidecar {
if APIKey == "" || serverURL == "" || dockerImage == "" { if APIKey == "" || dockerImage == "" {
if APIKey != "" || serverURL != "" || dockerImage != "" { if APIKey == "" && dockerImage != "" {
logger.Warningf("Incomplete configuration for the Scalyr sidecar: " + logger.Warning("Not running Scalyr sidecar: SCALYR_API_KEY must be defined")
"all of SCALYR_API_KEY, SCALYR_SERVER_HOST and SCALYR_SERVER_URL must be defined")
} }
return nil return nil
} }
return &spec.Sidecar{ scalarSpec := &spec.Sidecar{
Name: "scalyr-sidecar", Name: "scalyr-sidecar",
DockerImage: dockerImage, DockerImage: dockerImage,
Env: []v1.EnvVar{ Env: []v1.EnvVar{
{
Name: "POD_NAME",
ValueFrom: &v1.EnvVarSource{
FieldRef: &v1.ObjectFieldSelector{
APIVersion: "v1",
FieldPath: "metadata.name",
},
},
},
{
Name: "POD_NAMESPACE",
ValueFrom: &v1.EnvVarSource{
FieldRef: &v1.ObjectFieldSelector{
APIVersion: "v1",
FieldPath: "metadata.namespace",
},
},
},
{ {
Name: "SCALYR_API_KEY", Name: "SCALYR_API_KEY",
Value: APIKey, Value: APIKey,
@ -781,13 +762,13 @@ func generateScalyrSidecarSpec(clusterName, APIKey, serverURL, dockerImage strin
Name: "SCALYR_SERVER_HOST", Name: "SCALYR_SERVER_HOST",
Value: clusterName, Value: clusterName,
}, },
{
Name: "SCALYR_SERVER_URL",
Value: serverURL,
},
}, },
Resources: *containerResources, 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 // mergeSidecar merges globally-defined sidecars with those defined in the cluster manifest