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

Backport of [net-7710] don't overwrite prometheus path annotation if it's already been specified into release/1.2.x #3886

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #3846 to be assessed for backporting due to the inclusion of the label backport/1.2.x.

The below text is copied from the body of the original PR.


Changes proposed in this PR

  • Addresses Helm chart: User provided annotations should supersed default ones #1970
  • The issue specifically mentions client prometheus annotations, but I went ahead and made the change for all the places we have the prometheus path annotation. I only included the path annotation (rather than scrape and port) because the scrape and port annotations shouldn't change-- if metrics are enabled then scrape should be true and the port is hardcoded.

How I've tested this PR

How I expect reviewers to test this PR

Checklist


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/nd/net-7710-annotation-overwrite-fix/ideally-electric-imp branch from 16eaa3b to 5f4faf3 Compare April 5, 2024 19:54
@hc-github-team-consul-core hc-github-team-consul-core enabled auto-merge (squash) April 5, 2024 19:54
@hc-github-team-consul-core hc-github-team-consul-core merged commit caf4421 into release/1.2.x Apr 10, 2024
46 checks passed
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/nd/net-7710-annotation-overwrite-fix/ideally-electric-imp branch April 10, 2024 16:54
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