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

Changed order of sidecar env vars (#980) 

* Changed order of sidecar env vars

* Cleaned up test code
This commit is contained in:
Steffen Pøhner Henriksen 2020-05-25 16:32:33 +02:00 committed by GitHub
parent 3a49b485e5
commit 0fa61a6ab3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cluster/k8sres.go
View File

@ -531,7 +531,7 @@ func patchSidecarContainers(in []v1.Container, volumeMounts []v1.VolumeMount, su
}, },
}, },
} }
mergedEnv := append(container.Env, env...) mergedEnv := append(env, container.Env...)
container.Env = deduplicateEnvVars(mergedEnv, container.Name, logger) container.Env = deduplicateEnvVars(mergedEnv, container.Name, logger)
result = append(result, container) result = append(result, container)
} }

2
pkg/cluster/k8sres_test.go
View File

@ -1394,7 +1394,7 @@ func TestSidecars(t *testing.T) {
// replaced sidecar // replaced sidecar
// the order in env is important // the order in env is important
scalyrEnv := append([]v1.EnvVar{v1.EnvVar{Name: "SCALYR_API_KEY", Value: "abc"}, v1.EnvVar{Name: "SCALYR_SERVER_HOST", Value: ""}}, env...) scalyrEnv := append(env, v1.EnvVar{Name: "SCALYR_API_KEY", Value: "abc"}, v1.EnvVar{Name: "SCALYR_SERVER_HOST", Value: ""})
assert.Contains(t, s.Spec.Template.Spec.Containers, v1.Container{ assert.Contains(t, s.Spec.Template.Spec.Containers, v1.Container{
Name: "scalyr-sidecar", Name: "scalyr-sidecar",
Image: "scalyr-image", Image: "scalyr-image",