Skip to content

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

Merged
hc-github-team-consul-core merged 1 commit intorelease/1.4.xfrom
backport/nd/net-7710-annotation-overwrite-fix/abnormally-renewing-dassie
Apr 10, 2024
Merged

Backport of [net-7710] don't overwrite prometheus path annotation if it's already been specified into release/1.4.x#3888
hc-github-team-consul-core merged 1 commit intorelease/1.4.xfrom
backport/nd/net-7710-annotation-overwrite-fix/abnormally-renewing-dassie

Conversation

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

Backport

This PR is auto-generated from #3846 to be assessed for backporting due to the inclusion of the label backport/1.4.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/abnormally-renewing-dassie branch from 54ff37e to 1731d7d Compare April 5, 2024 19:55
@hc-github-team-consul-core hc-github-team-consul-core enabled auto-merge (squash) April 5, 2024 19:55
@hc-github-team-consul-core hc-github-team-consul-core merged commit ce1faae into release/1.4.x Apr 10, 2024
@hc-github-team-consul-core hc-github-team-consul-core deleted the backport/nd/net-7710-annotation-overwrite-fix/abnormally-renewing-dassie 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