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.

Sign up for GitHub

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

Jump to bottom

Fix cilium-envoy ServiceMonitor port name #27207

Merged
merged 1 commit into from
Aug 3, 2023
Merged

Fix cilium-envoy ServiceMonitor port name #27207

merged 1 commit into from
Aug 3, 2023

Conversation

pixiono
Copy link
Contributor

@pixiono pixiono commented Aug 2, 2023

Fixes the ServiceMonitor port so that Prometheus can scrape the service.

Fixes: #27206

@pixiono pixiono requested review from a team as code owners August 2, 2023 08:41
@pixiono pixiono requested a review from squeed August 2, 2023 08:41
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 2, 2023
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Aug 2, 2023
@dylandreimerink
Copy link
Member

FYI. CI breakage is not your fault, its an issue on main we are currently resolving

@dylandreimerink
Copy link
Member

The issue is now resolved, please rebase on main to fix the CI

@dylandreimerink dylandreimerink added release-note/bug This PR fixes an issue in a previous release of Cilium. area/helm Impacts helm charts and user deployment experience labels Aug 2, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Aug 2, 2023
@pixiono
Fix cilium-envoy ServiceMonitor port name
41e8e5e 
Fixes the ServiceMonitor port so that Prometheus can scrape the service.

Fixes: cilium#27206

Signed-off-by: René Veenhuis <re.veenhuis@gmail.com>
@pixiono
Copy link
Contributor Author

pixiono commented Aug 2, 2023

@dylandreimerink thanks for the info. I have done the rebase, let's see if the CI part works now.

@dylandreimerink
Copy link
Member

/test

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Aug 3, 2023
@dylandreimerink dylandreimerink merged commit 23c371c into cilium:main Aug 3, 2023
59 checks passed
@squeed squeed added the needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch label Jan 24, 2024
@squeed squeed mentioned this pull request Jan 24, 2024
Closed
2 tasks
@joamaki joamaki mentioned this pull request Jan 31, 2024
Merged
17 tasks
@joamaki joamaki added backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. and removed needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch labels Jan 31, 2024
@github-actions github-actions bot added backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. and removed backport-pending/1.14 The backport for Cilium 1.14.x for this PR is in progress. labels Feb 7, 2024
@michi-covalent michi-covalent mentioned this pull request Feb 13, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@squeed squeed squeed approved these changes

Assignees
No one assigned
Labels
area/helm Impacts helm charts and user deployment experience backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. kind/community-contribution This was a contribution made by a community member. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
cilium v1.14.7
Status: Released
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Wrong port in cilium-envoy ServiceMonitor
4 participants
@pixiono @dylandreimerink @squeed @joamaki