Skip to content

Helm: Ensure consistent default labels for all ServiceMonitor resources #41240

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
Merged
merged 1 commit into from
Aug 19, 2025
Merged

Helm: Ensure consistent default labels for all ServiceMonitor resources #41240

merged 1 commit into from
Aug 19, 2025

Conversation

baurmatt
Copy link
Contributor

This also fixes an issue were labels=null for the hubble-relay has been configured by default which lead to permanent Out-of-Sync state in Argo-CD

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!

Fixes: #issue-number

<!-- Enter the release note text here if needed or remove this section! -->

@baurmatt baurmatt requested review from a team as code owners August 18, 2025 11:37
@baurmatt baurmatt requested review from marseel and gandro August 18, 2025 11:37
@maintainer-s-little-helper
Copy link

Commit 772385e does not match "(?m)^Signed-off-by:".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper maintainer-s-little-helper bot added dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. labels Aug 18, 2025
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Aug 18, 2025
gandro
gandro approved these changes Aug 18, 2025
View reviewed changes
Copy link
Member

@gandro gandro left a comment

Choose a reason for hiding this comment

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

Thanks!

@gandro gandro added release-note/bug This PR fixes an issue in a previous release of Cilium. area/helm Impacts helm charts and user deployment experience needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch labels Aug 18, 2025
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Aug 18, 2025
@gandro gandro added the area/metrics Impacts statistics / metrics gathering, eg via Prometheus. label Aug 18, 2025
@gandro
Copy link
Member

gandro commented Aug 18, 2025

Please sign-off your commit by using git commit --amend -s && git push --force-with-lease. Otherwise this looks good to me

@baurmatt baurmatt force-pushed the helm-serviceMonitor-consistent-labels branch from 772385e to 696bff5 Compare August 18, 2025 12:15
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Aug 18, 2025
@baurmatt
Copy link
Contributor Author

@gandro Whoops, sorry! Fixed! :)

@gandro
Copy link
Member

gandro commented Aug 18, 2025

/test

@gandro gandro enabled auto-merge August 18, 2025 12:27
@gandro
Copy link
Member

gandro commented Aug 19, 2025

I've restarted ci-ginko because it fails because of #41194. If it keeps failing we might have to rebase on main to fix it.

@baurmatt
Ensure consistent default labels for all ServiceMonitor resources
a2e5702 
This also fixes an issue were `labels=null` for the hubble-relay has
been configured by default which lead to permanent Out-of-Sync state in
Argo-CD

Signed-off-by: Matthias Baur <m.baur@syseleven.de>
auto-merge was automatically disabled August 19, 2025 08:23

Head branch was pushed to by a user without write access

@baurmatt baurmatt force-pushed the helm-serviceMonitor-consistent-labels branch from 696bff5 to a2e5702 Compare August 19, 2025 08:23
@gandro
Copy link
Member

gandro commented Aug 19, 2025

/test

@gandro gandro enabled auto-merge August 19, 2025 08:25
@gandro gandro added this pull request to the merge queue Aug 19, 2025
@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 19, 2025
Merged via the queue into cilium:main with commit f008c15 Aug 19, 2025
68 checks passed
@joamaki joamaki mentioned this pull request Aug 19, 2025
Merged
19 tasks
@joamaki joamaki added backport-pending/1.18 The backport for Cilium 1.18.x for this PR is in progress. and removed needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch labels Aug 19, 2025
@github-actions github-actions bot added backport-done/1.18 The backport for Cilium 1.18.x for this PR is done. and removed backport-pending/1.18 The backport for Cilium 1.18.x for this PR is in progress. labels Aug 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gandro gandro gandro approved these changes

@marseel marseel marseel approved these changes

Assignees
No one assigned
Labels
area/helm Impacts helm charts and user deployment experience area/metrics Impacts statistics / metrics gathering, eg via Prometheus. backport-done/1.18 The backport for Cilium 1.18.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
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@baurmatt @gandro @marseel @joamaki