Fix accidentally broken thanosSelector after #1543
#1556
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
arajkumar
changed the title
arajkumar
changed the title
thanosSelector after #1543
paulfantom
reviewed
Jan 3, 2022
paulfantom
reviewed
Jan 5, 2022
| @@ -32,16 +32,17 @@ local defaults = { | |||
| mixin:: { | |||
| ruleLabels: {}, | |||
| _config: { | |||
| local _config = self, | |||
Previous PR[1] which deprecated `thanosSelector` accidentally broke the usage of it. This commit restores the old behaviour along with newly introduced `thanos` config variable. [1] prometheus-operator#1543 Co-authored-by: Pawe? Krupa <pawel@krupa.net.pl> Signed-off-by: Arunprasad Rajkumar <arajkuma@redhat.com>
arajkumar
force-pushed
the
fix-thanos-sidecar-selector
branch
from
59409e4
to
b7a135a
Compare
This pull request was closed.
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.
Previous PR #1543 which deprecated
thanosSelectoraccidentally broke theusage of it. This commit restores the old behaviour along with newly
introduced
thanosconfig variable.Signed-off-by: Arunprasad Rajkumar arajkuma@redhat.com
Description
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue.
Type of change
What type of changes does your code introduce to the kube-prometheus? 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. Later this will be copied to the changelog file.