Skip to content
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

[prometheus] Fix configMapAnnotations for Prometheus server #4432

Merged
merged 3 commits into from
Apr 8, 2024

Conversation

SirTediousOfFoo
Copy link
Contributor

What this PR does / why we need it

Fixes generation of Helm chart that was broken as a result of not testing a previously merged change. Currently configmap annotations can not be added because the with clause is used and scope isn't changed.

Which issue this PR fixes

Fixes oversight made in #4248 for which there is no specific issue at the moment.

Special notes for your reviewer

My first time contributing here, please be gentle if I missed something.

Checklist

  • DCO signed
  • Chart Version bumped
  • Title of the PR starts with chart name (e.g. [prometheus-couchdb-exporter])

Signed-off-by: Petar Ivankovic Milosevic <[email protected]>
Signed-off-by: Petar Ivankovic Milosevic <[email protected]>
Copy link
Member

@zeritti zeritti left a comment

Choose a reason for hiding this comment

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

Thank you, @SirTediousOfFoo, for your PR. Please, see my comments below.

charts/prometheus/templates/cm.yaml Outdated Show resolved Hide resolved
charts/prometheus/templates/cm.yaml Outdated Show resolved Hide resolved
Keeping to better Helm style

Co-authored-by: zeritti <[email protected]>
Signed-off-by: Petar Ivanković Milošević <[email protected]>
Copy link
Member

@zeritti zeritti left a comment

Choose a reason for hiding this comment

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

Thank you, LGTM 👍

@SirTediousOfFoo
Copy link
Contributor Author

Guess I shouldn't close until someone merges this, sorry

@zeritti zeritti merged commit 008bad2 into prometheus-community:main Apr 8, 2024
7 checks passed
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.

2 participants