Skip to content

Conversation

joamaki
Copy link
Contributor

@joamaki joamaki commented May 30, 2024

Fixed minor conflicts due to some diff lines not being present in v1.15.

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

 32428 32654 32684 32725 32746 31671

@joamaki joamaki 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 May 30, 2024
@joamaki
Copy link
Contributor Author

joamaki commented May 30, 2024

/test-backport-1.15

@julianwiedmann
Copy link
Member

Could you drop #32321 please? It was meant as a pre-req to make another backport easier, but that ended up requiring a custom PR anyway (#32778).

Sorry for the trouble :/.

@joamaki joamaki force-pushed the pr/v1.15-backport-2024-05-30-10-20 branch from 75f5de9 to b20d18f Compare May 30, 2024 08:35
@joamaki
Copy link
Contributor Author

joamaki commented May 30, 2024

Could you drop #32321 please? It was meant as a pre-req to make another backport easier, but that ended up requiring a custom PR anyway (#32778).

Sorry for the trouble :/.

Done.

@joamaki
Copy link
Contributor Author

joamaki commented May 30, 2024

/test-backport-1.15

Copy link
Member

@giorio94 giorio94 left a comment

Choose a reason for hiding this comment

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

My commits look good, thanks!

Copy link
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.

Looks good for #31671

@joamaki joamaki marked this pull request as ready for review May 30, 2024 12:07
@joamaki joamaki requested review from a team as code owners May 30, 2024 12:07
@joamaki joamaki requested a review from brlbil May 30, 2024 12:07
julianwiedmann and others added 2 commits May 30, 2024 14:12
[ upstream commit cf6b203 ]

To let EGW traffic exit the gateway through the correct interface,
we've introduced FIB lookup-driven redirects in the to-netdev path
(#26215). This is needed for cases
where the traffic first hits one interface via the default route, but then
needs to bounce to some other interface that matches the actual egressIP.
In this approach we masquerade the packet on its first pass through
to-netdev, set the SNAT_DONE mark, and then redirect to the actual egress
interface. Due to the SNAT_DONE mark we then skip the SNAT logic in the
second pass through to-netdev.

#29379 then improved the situation for
any EGW traffic that enters the gateway from the overlay network (==
anything that's not by a pod on the gateway). We now redirect in
from-overlay, straight to the actual egress interface and masquerade the
packet there.

Now also harmonize the approach for local pods, and defer the masquerade
until the packet hits the actual egress interface. This simplifies the
overall picture. But it also allows us to raise TO_NETWORK datapath trace
events that are enriched with the packet's original source IP - this event
is raised on the *second* pass through to-netdev, so we need the SNAT to
happen at the same time.

Also add a comment to clarify the check to skip HostFW for SNATed traffic.

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

Make sure to test all the three supported certificate generation methods
(i.e., helm, cronJob and certmanager) to prevent possible regressions
affecting only one of them.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
@joamaki joamaki force-pushed the pr/v1.15-backport-2024-05-30-10-20 branch from b20d18f to 1754a01 Compare May 30, 2024 12:12
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.

thank you!

@joamaki
Copy link
Contributor Author

joamaki commented May 30, 2024

/test-backport-1.15

@joamaki joamaki removed the request for review from gandro May 30, 2024 13:12
giorio94 and others added 4 commits May 30, 2024 16:22
[ upstream commit ecadbf8 ]

[ backporter's notes: additionally configured the cm-auth-mode value
  in the third matrix entry (the one using the external kvstore) to
  workaround validation given that we enable the clustermesh-apiserver
  in that case in Cilium v1.14 (although with 0 replicas) to force
  the creation of the clustermesh configuration. ]

Additionally test the stricter authentication modes, to prevent
introducing possible regressions due to incompatibilities between
Cilium versions.

Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
[ upstream commit 6a014ff ]

This aids in troubleshooting, as the list of ports is not visible
anywhere else in the sysdump.

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
[ upstream commit 76ecb4b ]

This fixes a bug where the port reservation of ports which can conflict
with transparent DNS proxy where only reserved if IPv6 was enabled.

The call to `reserveLocalIPPorts` was accidentally added in the
"IPv6-only" branch. This commit fixes that by unconditionally
reserving local ports.

Fixes: 11fe7cc ("cilium-cni: Reserve ports that can conflict with transparent DNS proxy")

Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
[ upstream commit 4cda262 ]

In the latest state, lint-build-commits takes over 90min. While it is
not desirable to take many time, bump it to 180min as a workaround.

Signed-off-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
Signed-off-by: Jussi Maki <jussi@isovalent.com>
[ upstream commit 6ed0098 ]

When queried for the routes of an unknown IP family the
kernel return the routes for all IP families.

This end up returning the IPv4 routes when IPv6 is disabled
at boot time. Therefore calling DeleteRouteTable with
family = AF_INET6 will delete IPv4 routes too, breaking
the DNS proxy.

Fixes: #30744

Signed-off-by: Foyer Unix <foyerunix@foyer.lu>
@giorio94 giorio94 force-pushed the pr/v1.15-backport-2024-05-30-10-20 branch from 1754a01 to c5c1039 Compare May 30, 2024 14:25
@giorio94
Copy link
Member

Edited ab1b332 to additionally configure the cm-auth-mode value in the third matrix entry (the one using the external kvstore) to workaround validation given that we enable the clustermesh-apiserver in that case in Cilium v1.14 (although with 0 replicas) to force the creation of the clustermesh configuration.

@giorio94
Copy link
Member

/test-backport-1.15

@joamaki joamaki merged commit 88fb8e5 into v1.15 May 31, 2024
@joamaki joamaki deleted the pr/v1.15-backport-2024-05-30-10-20 branch May 31, 2024 13:35
@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 May 31, 2024
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
No open projects
Status: Released
Development

Successfully merging this pull request may close these issues.

8 participants