Skip to content

Add extension points to cilium-envoy ds#42223

Merged
joestringer merged 1 commit intocilium:mainfrom
nezdolik:extend-envoy-ds
Oct 17, 2025
Merged

Add extension points to cilium-envoy ds#42223
joestringer merged 1 commit intocilium:mainfrom
nezdolik:extend-envoy-ds

Conversation

@nezdolik
Copy link
Copy Markdown
Contributor

@nezdolik nezdolik commented Oct 16, 2025

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!

This change adds multiple extension points for cilium envoy daemonset manifest.
Fixes: #issue-number

Added multiple extension points for cilium envoy daemonset manifest. 

@nezdolik nezdolik requested review from a team as code owners October 16, 2025 22:55
@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 Oct 16, 2025
@nezdolik nezdolik requested a review from sayboras October 16, 2025 22:55
Copy link
Copy Markdown
Contributor

@nickolaev nickolaev left a comment

Choose a reason for hiding this comment

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

LGTM

@nickolaev
Copy link
Copy Markdown
Contributor

/test

@borkmann borkmann added the release-note/misc This PR makes changes that have no direct user impact. label Oct 17, 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 Oct 17, 2025
@borkmann borkmann added the area/proxy Impacts proxy components, including DNS, Kafka, Envoy and/or XDS servers. label Oct 17, 2025
Copy link
Copy Markdown
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 ✅

@maintainer-s-little-helper
Copy link
Copy Markdown

Commit 100e485 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 the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Oct 17, 2025
@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 Oct 17, 2025
@viktor-kurchenko viktor-kurchenko removed the request for review from tommyp1ckles October 17, 2025 08:43
@viktor-kurchenko
Copy link
Copy Markdown
Contributor

/test

@maintainer-s-little-helper
Copy link
Copy Markdown

Commit 3e66042 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 the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Oct 17, 2025
@maintainer-s-little-helper
Copy link
Copy Markdown

Commit 3e66042 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

@sayboras sayboras removed the dont-merge/needs-sign-off The author needs to add signoff to their commits before merge. label Oct 17, 2025
@viktor-kurchenko
Copy link
Copy Markdown
Contributor

/test

@viktor-kurchenko viktor-kurchenko added the needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch label Oct 17, 2025
Copy link
Copy Markdown
Contributor

@Artyop Artyop left a comment

Choose a reason for hiding this comment

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

two empty commits that needs to be removed please !

if you want to use github GUI when the branch isn't up to date I think you can chose between "rebase" or "merge", picking the rebase option will not create a new commit AFAIK

@viktor-kurchenko
Copy link
Copy Markdown
Contributor

/test

@nezdolik
Copy link
Copy Markdown
Contributor Author

nezdolik commented Oct 17, 2025

@Artyop am not yet familiar with cilium PR contribution guidelines, but one could also squash all commits into one upon merge to main? E.g. rebasing overrides commit history and review comments may get lost.

@Artyop
Copy link
Copy Markdown
Contributor

Artyop commented Oct 17, 2025

@Artyop am not yet familiar with cilium PR contribution guidelines, but one could also squash all commits into one upon merge to main?

Well for this it's a bit up to you, I like to have a feature per commit but as long as your commit messages are clear on what is the purpose of the commit and how it works, you're good
If you want to squash you can, as long as the commit message explains the whole feature you've bundled into your commit :)
You may find more info on https://docs.cilium.io/en/stable/contributing/development/contributing_guide/

@nezdolik nezdolik force-pushed the extend-envoy-ds branch 2 times, most recently from ea6ceee to b0cab43 Compare October 17, 2025 14:27
@viktor-kurchenko
Copy link
Copy Markdown
Contributor

/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 Oct 17, 2025
@joestringer
Copy link
Copy Markdown
Member

one could also squash all commits into one upon merge to main? E.g. rebasing overrides commit history and review comments may get lost.

In general this makes sense, but in practice the common workflow for merging code in Cilium is that a @cilium/committers clicks the green button at the bottom of the page to "merge when ready". With this pattern, a committer makes the determination if they're happy merging the PR and queues the merge for the future. Then GitHub will wait for all code owners to approve, comment threads to be resolved, and tests to pass, then it will merge automatically. With this workflow it's less natural for the committer to pull the PR, amend it, push to your repository and then merge.

Most Cilium contributors would follow the pattern of force-pushing the branch when addressing feedback, and in the end we aim to have a bisectable tree with each commit introducing a separate logical change (notably, refactors should be separate from functional changes). I believe that the feedback threads are hidden by GitHub UI but still accessible from "breadcrumbs" on the PR page.

@joestringer
Copy link
Copy Markdown
Member

I'll hold back on merging this for now despite 'ready-to-merge' label just because I'm not sure if case sensitivity mentioned in my review is important.

Signed-off-by: Kateryna Nezdolii <kateryna.nezdolii@isovalent.com>
@nezdolik
Copy link
Copy Markdown
Contributor Author

@joestringer fixed the case sensitivity, it was not important for feature to work, but did break the naming style conventions used in the rest of the file

Copy link
Copy Markdown
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

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

Ok, thanks :)

@joestringer
Copy link
Copy Markdown
Member

/test

@joestringer joestringer enabled auto-merge October 17, 2025 16:26
@viktor-kurchenko viktor-kurchenko removed the needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch label Oct 17, 2025
@joestringer joestringer added this pull request to the merge queue Oct 17, 2025
Merged via the queue into cilium:main with commit 2e216d1 Oct 17, 2025
73 checks passed
Comment on lines +2514 to +2515
# -- Init containers added to the cilium Envoy DaemonSet.
initContainers: []
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Sorry for the late drive-by review.
But AFAICT this is not actually implemented. This PR only adds extension points and doesn't actually reference this helm value. Or am I missing something?

@cilium-release-bot cilium-release-bot bot moved this to Released in cilium v1.19.0 Feb 3, 2026
nezdolik added a commit to nezdolik/community that referenced this pull request Mar 13, 2026
nezdolik added a commit to nezdolik/community that referenced this pull request Mar 13, 2026
nezdolik added a commit to nezdolik/community that referenced this pull request Mar 13, 2026
joestringer pushed a commit to cilium/community that referenced this pull request Mar 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/proxy Impacts proxy components, including DNS, Kafka, Envoy and/or XDS servers. 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
Status: Released

Development

Successfully merging this pull request may close these issues.

10 participants