Skip to content

Deprecate thanosSelector and expose mixin._config.thanos config variable for thanos sidecar #1543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 16, 2021

Conversation

arajkumar
Copy link
Contributor

@arajkumar arajkumar commented Dec 9, 2021

Description

This commit deprecates existing thanosSelector and exposes a single config variable mixin._config.thanos to customize thanos sidecar mixins. It follows same structure as https://github.com/thanos-io/thanos/blob/d2d74dac9878f633f1fb0e253bcc0b1cdea376d3/mixin/config.libsonnet

Signed-off-by: Arunprasad Rajkumar [email protected]

Type of change

What type of changes does your code introduce to the kube-prometheus? Put an x in 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.

- Deprecate `thanosSelector` and expose `mixin._config.thanos` config variable for thanos sidecar

@arajkumar arajkumar force-pushed the add-thanos-targetgroup branch from eef8e74 to 6a43cda Compare December 9, 2021 17:49
@arajkumar arajkumar changed the title Expose Thanos targetGroup config variable Expose a mixin config variable for thanos sidecar Dec 9, 2021
@arajkumar arajkumar force-pushed the add-thanos-targetgroup branch from 6a43cda to 5a2b8b5 Compare December 10, 2021 03:24
@arajkumar arajkumar changed the title Expose a mixin config variable for thanos sidecar Remove thanosSelector and expose mixin._config.thanos config variable for thanos sidecar Dec 10, 2021
…able for thanos sidecar

This commit removes existing `thanosSelector` and exposes a single config variable `mixin._config.thanos` to customize thanos sidecar mixins. It follows same structure as https://github.com/thanos-io/thanos/blob/d2d74dac9878f633f1fb0e253bcc0b1cdea376d3/mixin/config.libsonnet

Signed-off-by: Arunprasad Rajkumar <[email protected]>
@arajkumar arajkumar force-pushed the add-thanos-targetgroup branch from 5a2b8b5 to 1fb864e Compare December 10, 2021 03:27
@arajkumar arajkumar requested a review from paulfantom December 10, 2021 03:27
Copy link
Contributor

@philipgough philipgough left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Member

@paulfantom paulfantom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be good to keep it backward compatible just for now and remove it after 0.10.0.

We already have a few cases of config which will need to be deprecated after 0.10.0, so writing all those cases in one migration doc should be easier for users than going through PRs (we don't have changelog yet).

@arajkumar arajkumar changed the title Remove thanosSelector and expose mixin._config.thanos config variable for thanos sidecar Deprecate thanosSelector and expose mixin._config.thanos config variable for thanos sidecar Dec 13, 2021
@arajkumar arajkumar requested a review from paulfantom December 13, 2021 10:54
Copy link
Member

@paulfantom paulfantom left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@arajkumar
Copy link
Contributor Author

@paulfantom Can you please merge this? Thank you.

@paulfantom paulfantom merged commit 3c8103b into prometheus-operator:main Dec 16, 2021
arajkumar added a commit to arajkumar/kube-prometheus that referenced this pull request Dec 17, 2021
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

Signed-off-by: Arunprasad Rajkumar <[email protected]>
arajkumar added a commit to arajkumar/kube-prometheus that referenced this pull request Jan 5, 2022
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 <[email protected]>
Signed-off-by: Arunprasad Rajkumar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants