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.13 Backports 2023-09-12 #28103

Merged
merged 6 commits into from Sep 13, 2023
Merged

v1.13 Backports 2023-09-12 #28103

merged 6 commits into from Sep 13, 2023

Conversation

gandro
Copy link
Member

@gandro gandro commented Sep 12, 2023 •
edited

PRs skipped due to conflicts:

Dropped based on author request:

Once this PR is merged, you can update the PR labels via:

for pr in 25321 27220 27855 27918 27805 27712; do contrib/backporting/set-labels.py $pr done 1.13; done

or with

make add-labels BRANCH=v1.13 ISSUES=25321,27220,27855,27918,27805,27712

@pchaigno @gandro
hubble: Remove spammy debug log message on lost events
f960b18 
[ upstream commit ffa06b1 ]

When debug log is enabled, and in particular when monitor aggregation is
disabled [1], this debug message tends to spam the agent logs. Instead
of rate-limiting it, given we already have a metric for the same [2],
let's just remove it.

1 - This combination of debug enabled and monitor aggregation disabled
   is very frequent on datapath debugging sessions.
2 - The hubble_lost_events_total metric.
Signed-off-by: Paul Chaignon <paul.chaignon@gmail.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro gandro added kind/backports This PR provides functionality previously merged into master. backport/1.13 This PR represents a backport for Cilium 1.13.x of a PR that was merged to main. labels Sep 12, 2023
@gandro gandro marked this pull request as ready for review September 12, 2023 12:27
@gandro gandro requested review from a team as code owners September 12, 2023 12:27
@gandro
Copy link
Member Author

gandro commented Sep 12, 2023 •
edited by maintainer-s-little-helper bot

/test-backport-1.13

Job 'Cilium-PR-K8s-1.18-kernel-4.19' failed:

Click to show.

Test Name

K8sAgentChaosTest Restart with long lived connections TCP connection is not dropped when cilium restarts

Failure Output

FAIL: Pods are not ready after timeout

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.18-kernel-4.19/159/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.18-kernel-4.19 so I can create one.

Then please upload the Jenkins artifacts to that issue.

@brb
Copy link
Member

brb commented Sep 12, 2023

@gandro Let's drop #27738. More PRs need to be backported to make the ci-e2e to pass.

brb and others added 5 commits September 12, 2023 16:57
@brb @gandro
ci-ipsec-upgrade: Enable IPv6
16689db 
[ upstream commit 5da3348 ]

https://github.com/cilium/cilium/issue/26944 has been resolved.

Signed-off-by: Martynas Pumputis <m@lambda.lt>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@danehans @gandro
pkg/node: Updates GetIPv6AllocCIDRs() to Properly Return Secondary CIDRs
55b514c 
[ upstream commit 762d8c9 ]

- Updates the GetIPv6AllocCIDRs() to check the length of IPv6SecondaryAllocCIDRs
instead of IPv4SecondaryAllocCIDRs.
- Adds test cases for GetIPv4AllocCIDRs() and GetIPv6AllocCIDRs() methods.

Fixes #27836

Signed-off-by: Daneyon Hansen <daneyon.hansen@solo.io>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@julianwiedmann @gandro
docs: egressgw: document incompatibility with Clustermesh
3a8524f 
[ upstream commit 05bdc1e ]

The current way of subscribing to node events is not compatible with
Clustermesh (see #25794). Reflect this
in the documentation.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@learnitall @gandro
policy: Fix potential nil pointer deref in selectorManager.GetSelections
ce3c9ba 
[ upstream commit 86a6ab9 ]

This commit address the case in which `selectorManager.GetSelections` is
called before `selectorManager.updateSelections` is called, which can
cause a panic due to a nil pointer dereference in case the internal
`selectorManager.selections` field is nil. To address this case, if the
`selectorManager` has a nil value for its internal field `selections`,
then `emptySelection` is returned.

The reason `GetSelections` cannot modify the internal `selections` field
if it sees that it is nil is because `selectorManager.setSelections`
requires the managing `SelectorCache.mutex` to be locked. This cannot be
guaranteed inside a call to `selectorManager.GetSelections`, which does
not require locking.

Signed-off-by: Ryan Drew <ryan.drew@isovalent.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@vipul-21 @lambdanis @gandro
docs: rephrasing the hubble intro doc
ab9333f 
[ upstream commit 258e87c ]

To reduce the duplication between the two paragraphs of hubble intro doc.

Co-authored-by: Anna Kapuścińska <ania0102@gmail.com>
Signed-off-by: Vipul Singh <vipul21sept@gmail.com>
Signed-off-by: Sebastian Wicki <sebastian@isovalent.com>
@gandro gandro force-pushed the pr/v1.13-backport-2023-09-12-2 branch from 65d7cf0 to ab9333f Compare September 12, 2023 14:57
@gandro
Copy link
Member Author

gandro commented Sep 12, 2023

@gandro Let's drop #27738. More PRs need to be backported to make the ci-e2e to pass.

Done!

brb
brb approved these changes Sep 12, 2023
View reviewed changes
Copy link
Member

@brb brb left a comment

Choose a reason for hiding this comment

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

Thanks!

@gandro
Copy link
Member Author

gandro commented Sep 12, 2023 •
edited

/test-backport-1.13

Edit:

  • test-1.24-4.19 hit docker rate limit 429 Too Many Requests - Server message: toomanyrequests: You have reached your pull rate limit. Haven't seen that one in a while. Restarting.

learnitall
learnitall approved these changes Sep 12, 2023
View reviewed changes
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.

Thank you!

pchaigno
pchaigno approved these changes Sep 12, 2023
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!

@gandro
Copy link
Member Author

gandro commented Sep 13, 2023 •
edited

/test-1.24-4.19

Edit: Hit docker limit again https://jenkins.cilium.io/job/Cilium-PR-K8s-1.24-kernel-4.19/172/

@gandro gandro added the dont-merge/wait-until-release Freeze window for current release is blocking non-bugfix PRs label Sep 13, 2023
@gandro
Copy link
Member Author

gandro commented Sep 13, 2023

/test-1.24-4.19

@gandro gandro removed the dont-merge/wait-until-release Freeze window for current release is blocking non-bugfix PRs label Sep 13, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot added ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Sep 13, 2023
@gandro
Copy link
Member Author

gandro commented Sep 13, 2023

According to Michi on Slack, backport PRs may be merged again.

@gandro gandro merged commit e039671 into v1.13 Sep 13, 2023
119 checks passed
@gandro gandro deleted the pr/v1.13-backport-2023-09-12-2 branch September 13, 2023 15:53
@jrajahalme jrajahalme mentioned this pull request Oct 17, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brb brb brb approved these changes

@pchaigno pchaigno pchaigno approved these changes

@danehans danehans danehans approved these changes

@learnitall learnitall learnitall approved these changes

@julianwiedmann julianwiedmann julianwiedmann approved these changes

Assignees
No one assigned
Labels
backport/1.13 This PR represents a backport for Cilium 1.13.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
7 participants
@gandro @brb @pchaigno @danehans @learnitall @julianwiedmann @vipul-21