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.

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.12 backports 2023-10-02 #28351

Merged
merged 2 commits into from
Oct 4, 2023
Merged

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented Oct 2, 2023

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

$ for pr in 26115 28272; do contrib/backporting/set-labels.py $pr done 1.12; done

@sayboras sayboras requested a review from a team as a code owner October 2, 2023 11:11
@sayboras sayboras added kind/backports This PR provides functionality previously merged into master. backport/1.12 This PR represents a backport for Cilium 1.12.x of a PR that was merged to main. labels Oct 2, 2023
@sayboras sayboras marked this pull request as draft October 2, 2023 11:16
@julianwiedmann
Copy link
Member

Note that the BPF fix will need #28295 to land first.

@sayboras
Copy link
Member Author

sayboras commented Oct 2, 2023

Note that the BPF fix will need #28295 to land first.

You beat me to this. Yes, I noticed the pending backport PR, so just mark this one as draft.

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.

The fix itself is good of course, so pre-approving. Thank you!

julianwiedmann and others added 2 commits October 3, 2023 00:31
[ upstream commit 458479b ]

b2de07a ("bpf: Fix missing drop notifications on ct lookup failures")
took care of most paths. But we also need to throw a drop notification when
ipv6_hdrlen() returns an error.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit cc56e70 ]

These resources are enabled in cilum-proxy build, and can be used in
CiliumEnvoyConfig directly, however, without related imported
statements, Cilium agent will fail to marshal/unmarshal objects.

Sample error

```
level=warning msg="Ignoring invalid CiliumEnvoyConfig JSON (proto:\u00a0(line 1:405): unable to resolve \"type.googleapis.com/envoy.extensions.filters.http.router.v3.Router\": \"not found\")
```

Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras force-pushed the pr/v1.12-backport-2023-10-02 branch from 606ae53 to f2626bf Compare October 2, 2023 13:31
@sayboras
Copy link
Member Author

sayboras commented Oct 2, 2023

/test-backport-1.12

@sayboras sayboras marked this pull request as ready for review October 2, 2023 13:42
@sayboras sayboras added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 3, 2023
@sayboras
Copy link
Member Author

sayboras commented Oct 3, 2023

Reviews are in, CI is also great, marking this ready to merge.

@ti-mo ti-mo merged commit 1ece86c into cilium:v1.12 Oct 4, 2023
54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.12 This PR represents a backport for Cilium 1.12.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.

None yet

3 participants