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.13 backports 2023-07-31 #27154
v1.13 backports 2023-07-31 #27154
Conversation
/test-backport-1.13 Job 'Cilium-PR-K8s-1.24-kernel-4.19' failed: Click to show.Test Name
Failure Output
Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.24-kernel-4.19/102/ If it is a flake and a GitHub issue doesn't already exist to track it, comment Then please upload the Jenkins artifacts to that issue. Job 'Cilium-PR-K8s-1.21-kernel-4.19' failed: Click to show.Test Name
Failure Output
Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.21-kernel-4.19/102/ If it is a flake and a GitHub issue doesn't already exist to track it, comment Then please upload the Jenkins artifacts to that issue. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! Thanks!
@julianwiedmann there is bpf unit test failure due to the below error, seems like v1.13 didn't have the new attribute local_ivp4 in bpf.h (added as part of #25438). Any suggestion on how to move forward ? https://github.com/cilium/cilium/actions/runs/5714021888/job/15480514433?pr=27154
|
Oh of course 🤦. It's fine to just drop that specific condition check from the test - thanks for digging it up @sayboras ! Should be straight-forward enough, but let me know if you want me to provide a custom backport. |
[ upstream commit d140758 ] Signed-off-by: Vipul Singh <singhvipul@microsof.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
e590b79
to
aca0171
Compare
[ upstream commit ebdfb37 ] If handle_nat_fwd() expands into a tail-call (eg. because both ENABLE_IPV4 and ENABLE_IPV6 are set), control doesn't return to the main to-netdev program. Thus the packet path never passes through the L4LB health-check processing. This is a regression caused by 54a8631 - previously, we would skip the NAT check in a full-DSR config (and the L4LB IPIP mode is always full-DSR). Fix it by pulling the health-check section up, so that it gets applied before walking down the NAT path. Also add a minimal integration test to cover the expected encapsulation behaviour. Fixes: 54a8631 ("bpf: nodeport: handle revDNAT for local backends at to-netdev/to-overlay") Signed-off-by: Julian Wiedmann <jwi@isovalent.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit 901b749 ] This commit adjusts the logic that the operator uses to control endpoint garbage collection and syncing in order to account for the case when CiliumEndpoint CRDs are disabled in kvstore mode. The operator will now only start the garbage collector if CiliumEndpoint CRD mode is enabled, and if it isn't enabled, the operator will check to ensure that the CiliumEndpoint CRD is installed in the cluster before starting a one-off gc sync. This will allow users to use kvstore mode without having to worry about setting the endpoint gc interval to zero, and it covers the case where a user transitions from CRD mode to kvstore mode. Fixes: cilium#24440 Signed-off-by: Ryan Drew <ryan.drew@isovalent.com> Signed-off-by: Tam Mach <tam.mach@cilium.io>
aca0171
to
44a1a43
Compare
Seems like the below patch helps diff --git a/bpf/tests/l4lb_ipip_health_check_host.c b/bpf/tests/l4lb_ipip_health_check_host.c
index ce9bd98fcd..e2f55e9dc7 100644
--- a/bpf/tests/l4lb_ipip_health_check_host.c
+++ b/bpf/tests/l4lb_ipip_health_check_host.c
@@ -67,10 +67,8 @@ int mock_skb_set_tunnel_key(__maybe_unused struct __sk_buff *skb,
{
if (from->tunnel_id != 0)
return -1;
- if (from->local_ipv4 != 0)
- return -2;
if (from->remote_ipv4 != bpf_ntohl(BACKEND_IP))
- return -3;
+ return -2;
return 0;
} |
/test-backport-1.13 Job 'Cilium-PR-K8s-1.23-kernel-4.19' failed: Click to show.Test Name
Failure Output
Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.23-kernel-4.19/159/ If it is a flake and a GitHub issue doesn't already exist to track it, comment Then please upload the Jenkins artifacts to that issue. Job 'Cilium-PR-K8s-1.25-kernel-4.19' failed: Click to show.Test Name
Failure Output
Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.25-kernel-4.19/812/ If it is a flake and a GitHub issue doesn't already exist to track it, comment Then please upload the Jenkins artifacts to that issue. |
/test-1.23-4.19 |
/test-1.25-4.19 |
Once this PR is merged, you can update the PR labels via: