Support injection of JAEGER_SERVICE_NAME based on app or k8s recommen… #362
Conversation
…ded labels Signed-off-by: Gary Brown <gary@brownuk.com>
Codecov Report
@@ Coverage Diff @@
## master #362 +/- ##
==========================================
+ Coverage 89.94% 89.96% +0.01%
==========================================
Files 64 64
Lines 3054 3059 +5
==========================================
+ Hits 2747 2752 +5
Misses 207 207
Partials 100 100
Continue to review full report at Codecov.
|
pkg/inject/sidecar_test.go
Outdated
| @@ -58,6 +58,39 @@ func TestInjectSidecarWithEnvVars(t *testing.T) { | |||
| assert.Equal(t, "jaeger,b3", dep.Spec.Template.Spec.Containers[0].Env[1].Value) | |||
| } | |||
|
|
|||
| func TestInjectSidecarWithEnvVarsK8sAppName(t *testing.T) { | |||
| jaeger := v1.NewJaeger("TestInjectSidecarWithEnvVars") | |||
There was a problem hiding this comment.
For the future, we could replace the instance name in tests with a random value, as this is something we always forget to change after a copy/paste... Or just have them all have the same value. The purpose of having a unique name per test is to avoid clashes in parallel tests, but we don't have such a scenario today.
There was a problem hiding this comment.
Sorry, I'm usually the one that falls into this trap :(
There was a problem hiding this comment.
I do it all the time as well.
pkg/inject/sidecar_test.go
Outdated
| assert.Equal(t, envVarServiceName, dep.Spec.Template.Spec.Containers[0].Env[0].Name) | ||
| assert.Equal(t, "testapp.default", dep.Spec.Template.Spec.Containers[0].Env[0].Value) | ||
| assert.Equal(t, envVarPropagation, dep.Spec.Template.Spec.Containers[0].Env[1].Name) | ||
| assert.Equal(t, "jaeger,b3", dep.Spec.Template.Spec.Containers[0].Env[1].Value) |
There was a problem hiding this comment.
Could you remove the assertions that are not relevant for the test?
Signed-off-by: Gary Brown <gary@brownuk.com>
…ded labels
Order of precedence is
app.kubernetes.io/instance, if not found then,app.kubernetes.io/nameand finallyapp(as now).Fixes #352
Signed-off-by: Gary Brown gary@brownuk.com