Skip to content

Conversation

gitsofaryan
Copy link
Contributor

Fixes: #37659
cc : @xmulligan @pchaigno

Description

This pull request updates the documentation for configuring a kube-proxy-free environment with DSR (Direct Server Return) enabled in annotation mode. The changes clarify the required parameters and provide examples for different DSR dispatch methods.

Problem

Users following the annotation-based DSR documentation encounter validation errors because the required dsrDispatch parameter is missing from examples. When bpf.lbModeAnnotation=true is set without explicitly specifying loadBalancer.dsrDispatch, Cilium fails to start with: Invalid value for --bpf-lb-dsr-dispatch: opt

Solution

  • Added a note specifying that when using annotation-based DSR mode (bpf.lbModeAnnotation=true), the loadBalancer.dsrDispatch parameter must be explicitly defined
  • Updated the existing Helm configuration example to include the missing loadBalancer.dsrDispatch=geneve parameter
  • Added an additional example demonstrating IPIP dispatch as an alternative
  • Clarified that all dispatch methods (opt, ipip, geneve) work with annotation mode

Changes Made

  • Updated Documentation/network/kubernetes/kubeproxy-free.rst in the "Annotation-based DSR and SNAT Mode" section
  • Added clear documentation note about dsrDispatch requirement

@gitsofaryan gitsofaryan requested review from a team as code owners August 1, 2025 12:09
@maintainer-s-little-helper
Copy link

Commits addf948, 6f43162 do 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 1, 2025
@github-actions github-actions bot added the kind/community-contribution This was a contribution made by a community member. label Aug 1, 2025
@qmonnet
Copy link
Member

qmonnet commented Aug 1, 2025

Thanks! Can you please rebase your branch on the current main, to get rid of the merge commits?

@qmonnet qmonnet added area/documentation Impacts the documentation, including textual changes, sphinx, or other doc generation code. release-note/misc This PR makes changes that have no direct user impact. labels Aug 1, 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 1, 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 Aug 1, 2025
@gitsofaryan
Copy link
Contributor Author

hi @qmonnet I have rebased the MR could you review it now!!

Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

Thanks!

Can we reorganise it a little, please? You inserted the note right between the paragraph that introduces the example (ending with a colon), and the example itself. I note that you also have the new example helm command outside of the note: it should probably be inside of it? I'm thinking something like this:

... would look as follows:

.. parsed-literal::

    helm... (example with geneve)

.. note::

    When using annotation-based DSR mode (...) as in the previous example, you must explicitly... Valid options are... For example, for environments where Geneve... can be used instead:

    .. parsed-literal:: # note the indent, to move it inside the note

        helm ... (example with ipip)

Or even without the second example. I think you already make it explicit what the valid options are, if we mention that IPIP can be used, we probably don't need the full snippet again, users should be able to replace geneve with ipip without difficulties.

@gitsofaryan
Copy link
Contributor Author

hey @qmonnet i have reorganized the codeblocks PTAL! 🙇

Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

Thank you! Preview

Can you please squash your two commits together?

@gitsofaryan
Copy link
Contributor Author

@qmonnet i have squashed the commits! Thankyou for your review!!

Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

Thanks, nearly there! Please edit your commit message to only keep the first title/description 🙂

This updates the documentation for annotation-based DSR, clarifying the required dsrDispatch parameter and providing examples for different dispatch methods.

Fixes: cilium#37659

Signed-off-by: Aryan Jain <aryan.jain.csbs22@ggits.net>
@gitsofaryan
Copy link
Contributor Author

@qmonnet PTAL!

Copy link
Member

@qmonnet qmonnet left a comment

Choose a reason for hiding this comment

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

Thank you

@qmonnet
Copy link
Member

qmonnet commented Aug 1, 2025

/test

@gitsofaryan
Copy link
Contributor Author

@qmonnet thanks 🙏🙏, can you please suggest me some issue related to LFX project.

@xmulligan
Copy link
Member

@gitsofaryan there aren't any LFX related issues. The mentee is chosen only based on their application.

@gitsofaryan
Copy link
Contributor Author

Thanks @xmulligan 🙏, so is their any process or learning to how to make your application selected?

@xmulligan
Copy link
Member

@gitsofaryan write a great cover letter and don't use AI

@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 4, 2025
@dylandreimerink dylandreimerink added this pull request to the merge queue Aug 4, 2025
Merged via the queue into cilium:main with commit 135cf15 Aug 4, 2025
65 checks passed
@alagoutte
Copy link
Contributor

it is planned to backport to stable branch ?

@pchaigno pchaigno added the needs-backport/1.18 This PR / issue needs backporting to the v1.18 branch label Aug 28, 2025
@pchaigno
Copy link
Member

it is planned to backport to stable branch ?

I've marked for backports.

@viktor-kurchenko viktor-kurchenko mentioned this pull request Sep 2, 2025
18 tasks
@viktor-kurchenko viktor-kurchenko 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 Sep 2, 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 Sep 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/documentation Impacts the documentation, including textual changes, sphinx, or other doc generation code. 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/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cilium agent fails to start when bpf.lbModeAnnotation is true. Invalid value for --bpf-lb-dsr-dispatch
7 participants