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

helm: Add values for custom service monitor annotations #18681

Merged
merged 1 commit into from
Feb 3, 2022

Conversation

michi-covalent
Copy link
Contributor

Define Helm values to include custom annotations for cilium-agent /
cilium-operator / hubble service monitors similar to how you can define
custom annotations for other resources.

Signed-off-by: Michi Mutsuzaki michi@isovalent.com

helm: Add values for custom service monitor annotations

@michi-covalent michi-covalent requested a review from a team as a code owner January 31, 2022 23:43
@michi-covalent michi-covalent requested review from a team and gandro January 31, 2022 23:43
@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 Jan 31, 2022
@michi-covalent michi-covalent added the release-note/minor This PR changes functionality that users may find relevant to operating Cilium. label Jan 31, 2022
@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 Jan 31, 2022
@sayboras sayboras added the area/helm Impacts helm charts and user deployment experience label Feb 1, 2022
Copy link
Member

@sayboras sayboras left a comment

Choose a reason for hiding this comment

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

LGTM 💯

Copy link
Member

@nathanjsweet nathanjsweet left a comment

Choose a reason for hiding this comment

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

🍏

@gandro
Copy link
Member

gandro commented Feb 2, 2022

As we don't have any tests with serviceMonitor.enabled=true, I don't see the point in running the Jenkins CI suite here. The Helm smoke tests passed. Marking ready to merge.

@gandro gandro added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 2, 2022
@sayboras
Copy link
Member

sayboras commented Feb 2, 2022

Travis CI failure seems legit, we might need to run make -C Documentation update-helm-values to make it happy.

@sayboras sayboras removed the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 2, 2022
Define Helm values to include custom annotations for cilium-agent /
cilium-operator / hubble service monitors similar to how you can define
custom annotations for other resources.

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
@michi-covalent
Copy link
Contributor Author

Travis CI failure seems legit, we might need to run make -C Documentation update-helm-values to make it happy.

👍 done!

@sayboras sayboras added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Feb 3, 2022
@joamaki joamaki merged commit f49d392 into cilium:master Feb 3, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.11.2 Feb 9, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.10.8 Feb 9, 2022
@michi-covalent michi-covalent deleted the pr/michi/annotations branch February 10, 2022 05:12
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.11.2 Feb 11, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.10 in 1.10.8 Feb 11, 2022
@jibi jibi added backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. and removed backport-pending/1.11 labels Feb 14, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.10 to Backport done to v1.11 in 1.11.2 Feb 14, 2022
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.10 to Backport done to v1.10 in 1.10.8 Feb 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/helm Impacts helm charts and user deployment experience backport-done/1.11 The backport for Cilium 1.11.x for this PR is done. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/minor This PR changes functionality that users may find relevant to operating Cilium.
Projects
No open projects
1.10.8
Backport done to v1.10
1.11.2
Backport done to v1.11
Development

Successfully merging this pull request may close these issues.

None yet

6 participants