Fix overriding of prometheus scrape #624
Merged
Conversation
This file contains hidden or 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
The prometheus.io.scrape annotation was being overridden in faas-netes if it was set. This means a user could never set it to true for a functtion using something like faas-cli store deploy figlet --annotation prometheus.io.scrape=true This was tested by writing unit tests to validate that the operator did not do the same thing and writing a new test for faas-netes's deployment handler to check that if its set, its not overridden. Then tested on k3d, using: 1) k3d create 2)arkade install openfaas 3) set the faas-netes container to the one created from this commit 4) faas-cli store deploy figlet --annotation prometheus.io.scrape=true 5) validate that the annotation was not overridden (kubectl get deploy -n openfaas-fn figlet -o yaml) Signed-off-by: Alistair Hey <[email protected]>
Waterdrips
force-pushed
the
waterdrips-prom-scrape-override
branch
from
5f65bfd to
b733782
Compare
|
if merged this would need:
|
alexellis
reviewed
Apr 24, 2020
alexellis
reviewed
Apr 24, 2020
| annotations := buildAnnotations(request) | ||
|
|
||
| if len(annotations) != 1 { | ||
| t.Errorf("want: %d annotations got: %d", 1, len(annotations)) |
There was a problem hiding this comment.
You could probably add a return there, or use t.Fatalf that @LucasRoesler introduced me to, which returns out of the test.
Also extract "true" to want := "true" please.
I'll merge, but send in the alteration after.
Waterdrips
pushed a commit
to Waterdrips/faas-netes
that referenced
this pull request
Apr 24, 2020
Signed-off-by: Alistair Hey <[email protected]>
11 tasks
alexellis
pushed a commit
that referenced
this pull request
Apr 24, 2020
Signed-off-by: Alistair Hey <[email protected]>
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.
Description
The prometheus.io.scrape annotation was being overridden in faas-netes
if it was set. This means a user could never set it to true for a
functtion using something like faas-cli store deploy figlet --annotation
prometheus.io.scrape=true
Signed-off-by: Alistair Hey [email protected]
Motivation and Context
fixes Allow Prometheus scraping annotation to be specified #621
How Has This Been Tested?
This was tested by writing unit tests to validate that the operator did
not do the same thing and writing a new test for faas-netes's deployment
handler to check that if its set, its not overridden.
Then tested on k3d, using:
2)arkade install openfaas
-n openfaas-fn figlet -o yaml)
Types of changes
Checklist:
git commit -s