Skip to content

Commit e1319b5

Browse files
committed
docs(cilium): say the SNAT backport is dropped by hand
The patch header cited a commit of cilium/cilium#49232, an open PR whose branch is force-pushed, so the commit is reachable from no ref. Cite the PR alone. It also read as if the build would flag the patch once upstream carries the fix. It does not: a fix that lands in another place leaves this patch applying cleanly as a second early return, so the drop is a manual step. Assisted-by: LLM Signed-off-by: Aleksei Sviridkin <[email protected]>
1 parent e816522 commit e1319b5

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

‎packages/system/cilium/images/cilium/patches/skip-snat-conflict-for-local-destinations.diff‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
Skip NodePort SNAT conflict handling for host traffic to a local endpoint.
22

3-
The hunks of https://github.com/cilium/cilium/pull/49232 (commit
4-
e0462275b8164463ae9b473b32718a64645cda6d), verbatim, applied to cilium
5-
v1.20.2 bpf/lib/nodeport_egress.h. Upstream commit 990f79be17
6-
("bpf,nodeport: generalize SNAT conflict detection") runs the conflict path
3+
The bpf/lib/nodeport_egress.h hunks of
4+
https://github.com/cilium/cilium/pull/49232, verbatim, applied to cilium
5+
v1.20.2. The PR is cited, not a commit of it, because its branch is
6+
rewritten until it merges. Upstream commit 990f79be17 ("bpf,nodeport:
7+
generalize SNAT conflict detection") runs the conflict path
78
for any host-marked packet on every bpf_host device, and that path replaces
89
MARK_MAGIC_HOST with MARK_MAGIC_SNAT_DONE. With kube-ovn chaining, host
910
traffic to a local pod leaves through ovn0, so the pod sees it as world:
@@ -12,8 +13,10 @@ drops the API server calling a webhook on its own node. Upstream report:
1213
https://github.com/cilium/cilium/issues/49208, downstream tracking:
1314
https://github.com/cozystack/cozystack/issues/4781.
1415

15-
Drop this patch once a cilium release we ship carries cilium/cilium#49232.
16-
Until then `make update` dry-runs it against the new tag.
16+
Drop this patch by hand once a cilium release we ship carries the fix.
17+
Nothing detects that: `make update` and the image build fail only when a
18+
hunk stops applying, and a fix that lands upstream in another place leaves
19+
this one applying cleanly as a second, redundant early return.
1720

1821
--- a/lib/nodeport_egress.h
1922
+++ b/lib/nodeport_egress.h

0 commit comments

Comments
 (0)