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

v1.15 Backports 2024-02-11 #30704

Merged
merged 3 commits into from Feb 12, 2024
Merged

v1.15 Backports 2024-02-11 #30704

merged 3 commits into from Feb 12, 2024

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented Feb 11, 2024

Once this PR is merged, a GitHub action will update the labels of these PRs:

 28723 30643

julianwiedmann and others added 3 commits February 11, 2024 03:10
[ upstream commit 2853c52 ]

When applying SNAT to a packet, also report the original source address in
the subsequent trace event. This helps to associate the internal and
external view of a connection.

We use the `orig_addr` field in the trace event, which was originally
introduced back with b3aa583 ("bpf: Report original source IP in TRACE_TO_LXC")

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 1113d70 ]

This helps to clarify the exact origin of a TO_NETWORK trace event.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 5822544 ]

Signed-off-by: Feroz Salam <feroz.salam@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras added kind/backports This PR provides functionality previously merged into master. backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. labels Feb 11, 2024
@sayboras
Copy link
Member Author

/test-backport-1.15

@sayboras sayboras marked this pull request as ready for review February 11, 2024 03:39
@sayboras sayboras requested review from a team as code owners February 11, 2024 03:39
@sayboras sayboras requested a review from glibsm February 11, 2024 03:39
@sayboras sayboras added the release-blocker/1.15 This issue will prevent the release of the next version of Cilium. label Feb 11, 2024
@michi-covalent
Copy link
Contributor

Conformance Gateway API got renamed to Conformance Gateway API (ci-gateway-api) and it passed. time to 🚀🙏

@michi-covalent michi-covalent merged commit 1ccc66a into v1.15 Feb 12, 2024
227 checks passed
@michi-covalent michi-covalent deleted the pr/v1.15-backport-2024-02-11 branch February 12, 2024 00:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.15 This PR represents a backport for Cilium 1.15.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. release-blocker/1.15 This issue will prevent the release of the next version of Cilium.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants