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.

Sign up for GitHub

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

Jump to bottom

v1.14 Backports 2024-03-05 #31156

Merged
merged 6 commits into from Mar 11, 2024
Merged

v1.14 Backports 2024-03-05 #31156

merged 6 commits into from Mar 11, 2024

Conversation

pippolo84
Copy link
Member

@pippolo84 pippolo84 commented Mar 5, 2024 •
edited

sayboras and others added 6 commits March 5, 2024 11:42
@sayboras @pippolo84
xds: Avoid xds timeout due to agent restart in envoy DS mode
729e1f5 
[ upstream commit d7dba5e ]

For external envoy, xds server and envoy are having different life
cycles i.e. each is running in its own pod, and can be deployed or
restarted independently. This commit is to handle the case that xds in
cilium agent got restarted, and nonce value is always 0.

Sample error
```
2024-02-05T12:49:51.771714518Z level=warning msg="Regeneration of endpoint failed" bpfCompilation=0s bpfLoadProg=105.68356ms bpfWaitForELF="24.396µs" bpfWriteELF=1.802221ms ciliumEndpointName=cilium-test/client-56f8968958-fqdl4 containerID=245b2aaac2 containerInterface=eth0 datapathPolicyRevision=5 desiredPolicyRevision=6 endpointID=134 error="Error while configuring proxy redirects: proxy state changes failed: context canceled" identity=1713 ipv4=10.244.1.1 ipv6="fd00:10:244:1::9544" k8sPodName=cilium-test/client-56f8968958-fqdl4 mapSync=2.476505ms policyCalculation=1.240346ms prepareBuild="437.049µs" proxyConfiguration="837.119µs" proxyPolicyCalculation="234.369µs" proxyWaitForAck=2m34.697546384s reason="policy rules added" subsys=endpoint total=2m34.818201428s waitingForCTClean=270ns waitingForLock="2.605µs"
```

Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
@jrajahalme @pippolo84
bitlpm: Factor out common code
b6fd015 
[ upstream commit 6b63ea2 ]

Reduce code repetition by defining a 'traverse' function that is shared
between multiple functions.

Clarify comments.

Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
@julianwiedmann @pippolo84
loader: also populate NATIVE_DEV_IFINDEX for cilium_overlay
ad1447a 
[ upstream commit 6b98a0b ]

Avoid any odd surprises when this macro ends up being used by shared
nodeport.h code.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
@saintdle @pippolo84
Update kafka-sw-gen-traffic.sh
b54a3af 
[ upstream commit 7a5a429 ]

Fixed `kubectl exec` syntax

Signed-off-by: Dean <22192242+saintdle@users.noreply.github.com>
Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
@nathanjsweet @pippolo84
container/bitlpm: Add Lookup Boolean Return Value
374fe06 
[ upstream commit 5a96a95 ]

Lookup currently returns the default value of
the bitlpm.Trie when it fails to find a match.
There are cases where comparing the default
value to the return value is logically expensive
(i.e. code needs to be written to do the comparison).
Lookup can easily return a boolean value to indicate
whether it failed.

Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
@pchaigno @pippolo84
bugtool: Capture memory fragmentation info from /proc
33a2f64 
[ upstream commit 1c3a17f ]

This information can be useful to understand why memory allocation in
the kernel may fail (ex. for maps or for XFRM). I've checked that these
two files are accessible from a typical cilium-agent deployment (on
GKE).

Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
@pippolo84 pippolo84 added kind/backports This PR provides functionality previously merged into master. backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. labels Mar 5, 2024
@pippolo84 pippolo84 marked this pull request as ready for review March 5, 2024 10:43
@pippolo84 pippolo84 requested a review from a team as a code owner March 5, 2024 10:43
pchaigno
pchaigno approved these changes Mar 5, 2024
View reviewed changes
Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

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

My PR looks good. Thanks Fabio!

sayboras
sayboras approved these changes Mar 5, 2024
View reviewed changes
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.

Thanks and looks good for my commit.

@pippolo84
Copy link
Member Author

/test-backport-1.14

nathanjsweet
nathanjsweet approved these changes Mar 5, 2024
View reviewed changes
Copy link
Member

@nathanjsweet nathanjsweet left a comment

Choose a reason for hiding this comment

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

My changes LGTM.

@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 Mar 11, 2024
@jrajahalme jrajahalme merged commit 1256b5e into cilium:v1.14 Mar 11, 2024
59 of 60 checks passed
@thorn3r thorn3r mentioned this pull request Mar 13, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nathanjsweet nathanjsweet nathanjsweet approved these changes

@joestringer joestringer joestringer approved these changes

@pchaigno pchaigno pchaigno approved these changes

@jrajahalme jrajahalme jrajahalme approved these changes

@sayboras sayboras sayboras approved these changes

@julianwiedmann julianwiedmann julianwiedmann approved these changes

Assignees
No one assigned
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@pippolo84 @nathanjsweet @joestringer @pchaigno @jrajahalme @sayboras @julianwiedmann @saintdle