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 template typo #29976

Merged
merged 2 commits into from
Jan 8, 2024
Merged

Fix cilium-envoy ServiceMonitor template typo #29976

merged 2 commits into from
Jan 8, 2024

Conversation

cornfeedhobo
Copy link
Contributor

Please ensure your pull request adheres to the following guidelines:

  • For first time contributors, read Submitting a pull request
  • All code is covered by unit and/or runtime tests where feasible.
  • All commits contain a well written commit description including a title,
    description and a Fixes: #XXX line if the commit addresses a particular
    GitHub issue.
  • If your commit description contains a Fixes: <commit-id> tag, then
    please add the commit author[s] as reviewer[s] to this issue.
  • All commits are signed off. See the section Developer’s Certificate of Origin
  • Provide a title or release-note blurb suitable for the release notes.
  • Are you a user of Cilium? Please add yourself to the Users doc
  • Thanks for contributing!

@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 Dec 19, 2023
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Dec 19, 2023
@joestringer joestringer added release-note/misc This PR makes changes that have no direct user impact. needs-backport/1.14 This PR / issue needs backporting to the v1.14 branch needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Dec 19, 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 Dec 19, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in v1.15.0-rc.1 Dec 19, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from main in 1.14.6 Dec 19, 2023
@joestringer
Copy link
Member

Thanks for the fix. I've triggered the smoke tests, feel free to mark the PR as "Ready for review" when you would like review. Given the time of year, there may be some delays in review.

@cornfeedhobo cornfeedhobo marked this pull request as ready for review December 19, 2023 12:06
@cornfeedhobo cornfeedhobo requested review from a team as code owners December 19, 2023 12:06
@cornfeedhobo cornfeedhobo force-pushed the envoy-servicemonitor-annotations-and-labels branch from 212cd70 to 4711fd4 Compare December 19, 2023 12:09
@cornfeedhobo
envoy: ServiceMonitor typo fix
9d6ef00 
When the cilium-envoy ServiceMonitor was last updated, the required
lookup for .annotation was left out.

Signed-off-by: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
@cornfeedhobo
envoy: add name label to ServiceMonitor.
07185ff 
This commit adds the app.kubernetes.io/name label to cilium-envoy
ServiceMonitor, matching the convention in cilium-operator.

Signed-off-by: cornfeedhobo <cornfeedhobo@fuzzlabs.org>
@cornfeedhobo cornfeedhobo force-pushed the envoy-servicemonitor-annotations-and-labels branch from 4711fd4 to 07185ff Compare December 19, 2023 12:10
meyskens
meyskens approved these changes Dec 19, 2023
View reviewed changes
Copy link
Member

@meyskens meyskens left a comment

Choose a reason for hiding this comment

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

LGTM

@meyskens
Copy link
Member

/test

@cornfeedhobo
Copy link
Contributor Author

Do I need to keep rebasing, or is this fine, or will y'all handle that?

@joestringer
Copy link
Member

@cornfeedhobo no need to keep rebasing the PR. Cilium's tree changes at a fairly high rate, there's no way for every PR to keep up.

@joestringer
Copy link
Member

ci-ipsec-upgrade failed with known failure #29987 . No need to take further action on CI side.

@meyskens meyskens added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jan 8, 2024
@joestringer joestringer merged commit 2f3e3ec into cilium:main Jan 8, 2024
61 of 62 checks passed
@joestringer
Copy link
Member

Thanks for your contribution @cornfeedhobo!

@jibi jibi mentioned this pull request Jan 11, 2024
Merged
9 tasks
@jibi jibi 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 11, 2024
@jibi jibi mentioned this pull request Jan 12, 2024
Merged
32 tasks
@jibi jibi added backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. and removed needs-backport/1.15 This PR / issue needs backporting to the v1.15 branch labels Jan 12, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.14 in 1.14.6 Jan 12, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from main to Backport pending to v1.15 in v1.15.0-rc.1 Jan 12, 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 Jan 15, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.14 to Backport done to v1.14 in 1.14.6 Jan 15, 2024
@aanm aanm mentioned this pull request Jan 16, 2024
Merged
@gentoo-root gentoo-root mentioned this pull request Jan 17, 2024
Merged
@giorio94 giorio94 added backport-done/1.15 The backport for Cilium 1.15.x for this PR is done. and removed backport-pending/1.15 The backport for Cilium 1.15.x for this PR is in progress. labels Jan 29, 2024
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.15 to Backport done to v1.15 in v1.15.0-rc.1 Jan 29, 2024
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

@joamaki joamaki joamaki approved these changes

@meyskens meyskens meyskens approved these changes

Assignees
No one assigned
Labels
backport-done/1.14 The backport for Cilium 1.14.x for this PR is done. backport-done/1.15 The backport for Cilium 1.15.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/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.14.6
Backport done to v1.14
v1.15.0-rc.1
Backport done to v1.15
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@cornfeedhobo @joestringer @meyskens @squeed @joamaki @jibi @giorio94