Add Prometheus scrape annotations to agent #684
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jpkrohling
changed the title
objectiser
approved these changes
Oct 7, 2019
pkg/inject/sidecar_test.go
Outdated
| @@ -160,7 +160,6 @@ func TestInjectSidecarWithEnvVarsOverridePropagation(t *testing.T) { | |||
| assert.Contains(t, dep.Spec.Template.Spec.Containers[0].Env, traceContextEnvVar) | |||
| assert.Contains(t, dep.Spec.Template.Spec.Containers[0].Env, corev1.EnvVar{Name: envVarServiceName, Value: "testapp.default"}) | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
nit: Can you restore this line.
Add default prometheus annotations to be inserted at sidecar in case the deployment don't have any Test(sidecar):Insertion of prometheus annotations Add a test for a case with a deployment without any annotation and another one for a deployment with annotations different from those that we insert as default Signed-off-by: Nivaldo Melo <nivaldogmelo@gmail.com>
|
The tests are now failing in a recipe for target vendor, that's strange since i only added a newline in a file. Locally i can run |
|
It failed due to this: I'm restarting the jobs, hopefully the host is up again. |
|
CI passed. Thanks for your contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in #28, it was created a way to insert prometheus annotations at agents that are deployed as sidecars so it won't overwrite similar annotations provided by the service.
Closes #28