Fix relabelings for ScrapeConfig #5611
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
xiu
approved these changes
May 28, 2023
philipgough
approved these changes
May 29, 2023
There was a problem hiding this comment.
lgtm
@EtienneBarbier @xiu - if we want to include this fix as a patch release it should target release-0.65 branch instead of main
|
Ok, only one PR in the release branch (with backport to main) or two PR ? |
|
@EtienneBarbier just this one and we can cherry-pick back after |
|
Ok Great 👍 |
|
@EtienneBarbier I think it will need a rebase when you change the target branch btw |
EtienneBarbier
force-pushed
the
fix_scrapeconfigs_relabeling
branch
4 times, most recently
from
73e2ddc
to
cae5447
Compare
|
@philipgough Rebase done. |
|
@EtienneBarbier I think we might want to limit this PR to just commit cae5447 as opposed to the unrelated tests too! |
Signed-off-by: EtienneBarbier <etienne.barbier@atos.net>
EtienneBarbier
force-pushed
the
fix_scrapeconfigs_relabeling
branch
from
cae5447
to
f42fa79
Compare
simonpasquier
approved these changes
May 31, 2023
philipgough
merged commit 6ae0250
into
prometheus-operator:release-0.65
16 checks passed
philipgough
added a commit
that referenced
this pull request
May 31, 2023
* Fix relabelings for ScrapeConfig (#5611) Signed-off-by: EtienneBarbier <etienne.barbier@atos.net> * chore: Prep for release 0.65.2 (#5622) * test: Add tests for ScrapeConfig relabelling --------- Signed-off-by: EtienneBarbier <etienne.barbier@atos.net> Co-authored-by: Etienne Barbier <etienne.barbier@atos.net>
mcbenjemaa
pushed a commit
to mcbenjemaa/prometheus-operator
that referenced
this pull request
Jul 14, 2023
* Fix relabelings for ScrapeConfig (prometheus-operator#5611) Signed-off-by: EtienneBarbier <etienne.barbier@atos.net> * chore: Prep for release 0.65.2 (prometheus-operator#5622) * test: Add tests for ScrapeConfig relabelling --------- Signed-off-by: EtienneBarbier <etienne.barbier@atos.net> Co-authored-by: Etienne Barbier <etienne.barbier@atos.net>
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
Fix relabelings issue in ScrapeConfig CRD, generate them correctly.
Fix #5610
Type of change
What type of changes does your code introduce to the Prometheus operator? Put an
xin the box that apply.CHANGE(fix or feature that would cause existing functionality to not work as expected)FEATURE(non-breaking change which adds functionality)BUGFIX(non-breaking change which fixes an issue)ENHANCEMENT(non-breaking change which improves existing functionality)NONE(if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)Changelog entry
Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.