Skip to content

Conversation

rastislavs
Copy link
Contributor

@rastislavs rastislavs commented Oct 28, 2024

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

 33998 35286 35165 35351 35173 35574

marseel and others added 9 commits October 28, 2024 10:39
[ upstream commit 5e59656 ]

Before, we were always printing nil from previous err rather than
current ferr.

Fixes: #28163

Signed-off-by: Marcel Zieba <marcel.zieba@isovalent.com>
Signed-off-by: Rastislav Szabo <rastislav.szabo@isovalent.com>
[ upstream commit c321f90 ]

[ backporter's notes: manually resolved conflict in skipped features ]

Looking at #24622 this should now
be fixed.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
[ upstream commit ed34095 ]

Signed-off-by: Gilberto Bertin <jibi@cilium.io>
Signed-off-by: Rastislav Szabo <rastislav.szabo@isovalent.com>
[ upstream commit abdaddc ]

When redirecting from a L3 device to the overlay interface, we need to
manually add a L2 header to the (inner) packet.

#33421 fixed this for the case of
Nodeport NAT traffic from the LB node to a backend. Generalize it so
that it helps all users of the nodeport_add_tunnel_encap() helper - for
example DSR-Geneve or EgressGW reply traffic.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Rastislav Szabo <rastislav.szabo@isovalent.com>
[ upstream commit 677bcc1 ]

Validate that the from-netdev program adds a L2 header to the packet,
before redirecting it to the overlay interface.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Rastislav Szabo <rastislav.szabo@isovalent.com>
[ upstream commit 8190512 ]

This commit changes the builder image for cilium-operator to be the
cilium-builder image, rather than the golang image. This change will
allow for arm64 builds of the cilium-operator to be built with CGO
enabled due to the cilium-builder image containing multi-platform C
compilers. This build configuration is a stepping stone for other
build-time features, such as CGO binaries with race detection enabled.

Fixes: 35324

Signed-off-by: Ryan Drew <ryan.drew@isovalent.com>
Signed-off-by: Rastislav Szabo <rastislav.szabo@isovalent.com>
[ upstream commit a55178f ]

[ backporter's notes:
  * fixed MTU argument to ReinstallRoutingRules in pkg/datapath/loader/base.go
  * resolved trivial conflict in Proxy interface in pkg/datapath/types/loader.go
]

This commit fixes the pod-to-pod traffic being dropped because of using a
higher MTU value. This is caused by a non-configuration of the default route
from proxy, in the routing table n. 2005 respectively. While the pod-to-pod
default route MTU is being adjusted according to the IPSec overhead and the
adjusted size of the authentication key, the from-proxy route is not changed
as well leading to connectivity issues when both ingress and egress policies
are in-place.

Fixes: #33168

Signed-off-by: Simone Magnani <simone.magnani@isovalent.com>
[ upstream commit 3ccd76a ]

[ backporter's notes: resolved imports conflicts in pkg/proxy/routes_test.go ]

This commit extends the routes tests to check that, according to the previous
commit, the default route in the table 2005 is correctly installed with the
provided MTU. This is particularly useful as when enabling both ingress
and egress policies with IPSec, the default route has a lower MTU since
it needs to account also for the encryption overhead.
With this commit, in the tests we make sure that, when provided, the correct
value is used rather than the default one.

Signed-off-by: Simone Magnani <simone.magnani@isovalent.com>
[ upstream commit a4da426 ]

Tunnel routing support for the XDP LB was added back in v1.14, update
the docs. This was missed in #27091.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Rastislav Szabo <rastislav.szabo@isovalent.com>
@rastislavs rastislavs 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 Oct 28, 2024
@rastislavs
Copy link
Contributor Author

/test-backport-1.15

@rastislavs rastislavs marked this pull request as ready for review October 28, 2024 11:31
@rastislavs rastislavs requested review from a team as code owners October 28, 2024 11:31
@rastislavs rastislavs requested a review from brlbil October 28, 2024 11:31
Copy link
Member

@julianwiedmann julianwiedmann left a comment

Choose a reason for hiding this comment

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

(ran the conformance test 3x, looks good)

Copy link
Contributor

@smagnani96 smagnani96 left a comment

Choose a reason for hiding this comment

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

LGTM also the conflict resolution for my commits, many thanks for it 👍

Copy link
Contributor

@learnitall learnitall left a comment

Choose a reason for hiding this comment

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

Thanks!

@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 28, 2024
@julianwiedmann julianwiedmann merged commit 280bc47 into v1.15 Oct 29, 2024
275 checks passed
@julianwiedmann julianwiedmann deleted the pr/v1.15-backport-2024-10-28-10-39 branch October 29, 2024 06:50
smagnani96 added a commit to smagnani96/cilium that referenced this pull request Nov 4, 2024
This commit enables the `pod-to-pod-with-l7-policy-encryption` cli
connectivity test from v1.15, after the successful backports of cilium#35173 in:

* v1.15: cilium#35586
* v1.16: cilium#35543

While enabling the test, in this commit we split the version check logic
(that is independent from the IP family used) from the check for running
IPv6+IPsec (that should be prevented due to a current limitation of
having a flaky plain-text packet in the test suite, tracked in cilium#35485).

Signed-off-by: Simone Magnani <simone.magnani@isovalent.com>
smagnani96 added a commit to smagnani96/cilium that referenced this pull request Nov 5, 2024
This commit enables the `pod-to-pod-with-l7-policy-encryption` cli
connectivity test for v1.15 and v1.16, after the backports of cilium#35173 in:

* v1.15: cilium#35586
* v1.16: cilium#35543

While enabling the test, in this commit we split the version check logic
(that is independent from the IP family used) from the check for running
IPv6+IPsec (that should be prevented due to a current limitation of
having a flaky plain-text packet in the test suite, tracked in cilium#35485).

Signed-off-by: Simone Magnani <simone.magnani@isovalent.com>
github-merge-queue bot pushed a commit that referenced this pull request Nov 22, 2024
This commit enables the `pod-to-pod-with-l7-policy-encryption` cli
connectivity test for v1.15 and v1.16, after the backports of #35173 in:

* v1.15: #35586
* v1.16: #35543

While enabling the test, in this commit we split the version check logic
(that is independent from the IP family used) from the check for running
IPv6+IPsec (that should be prevented due to a current limitation of
having a flaky plain-text packet in the test suite, tracked in #35485).

Signed-off-by: Simone Magnani <simone.magnani@isovalent.com>
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. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants