Skip to content

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented Oct 31, 2024

Please refer to individual commit for more details

Upstream testing is done via cilium/cilium#35959

TODO:

  • Cut 1.30 branch once this PR is merged.

@sayboras sayboras force-pushed the pr/tammach/envoy-1.31 branch 4 times, most recently from dccc491 to 19d9885 Compare November 13, 2024 12:28
sayboras added a commit to cilium/cilium that referenced this pull request Nov 13, 2024
sayboras added a commit to cilium/cilium that referenced this pull request Nov 13, 2024
Relates: cilium/proxy#998
Signed-off-by: Tam Mach <tam.mach@cilium.io>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras force-pushed the pr/tammach/envoy-1.31 branch from 19d9885 to 57258f1 Compare November 14, 2024 09:23
sayboras added a commit to cilium/cilium that referenced this pull request Nov 14, 2024
Relates: cilium/proxy#998
Signed-off-by: Tam Mach <tam.mach@cilium.io>
Relates: envoyproxy/envoy#34708
Relates: envoyproxy/envoy#34761
Relates: envoyproxy/envoy#34437
Relates: envoyproxy/envoy#34012

Signed-off-by: Tam Mach <tam.mach@cilium.io>
This is to fix the clang cross compilation issue for liburing, which is
recently required after the PR envoyproxy/envoy#33107

```
ld.lld: error: bazel-out/aarch64-fastbuild/bin/external/envoy/bazel/foreign_cc/liburing/lib/liburing.a(setup.ol) is incompatible with elf64-littleaarch64
ld.lld: error: bazel-out/aarch64-fastbuild/bin/external/envoy/bazel/foreign_cc/liburing/lib/liburing.a(queue.ol) is incompatible with elf64-littleaarch64
ld.lld: error: bazel-out/aarch64-fastbuild/bin/external/envoy/bazel/foreign_cc/liburing/lib/liburing.a(register.ol) is incompatible with elf64-littleaarch64
ld.lld: error: bazel-out/aarch64-fastbuild/bin/external/envoy/bazel/foreign_cc/liburing/lib/liburing.a(syscall.ol) is incompatible with elf64-littleaarch64
ld.lld: error: bazel-out/aarch64-fastbuild/bin/external/envoy/bazel/foreign_cc/liburing/lib/liburing.a(version.ol) is incompatible with elf64-littleaarch64
ld.lld: error: bazel-out/aarch64-fastbuild/bin/external/envoy/bazel/foreign_cc/liburing/lib/liburing.a(nolibc.ol) is incompatible with elf64-littleaarch64
```
@sayboras sayboras force-pushed the pr/tammach/envoy-1.31 branch from 57258f1 to ff9d0ff Compare November 14, 2024 13:10
sayboras added a commit to cilium/cilium that referenced this pull request Nov 14, 2024
Relates: cilium/proxy#998
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras requested a review from jrajahalme November 14, 2024 13:42
@sayboras sayboras marked this pull request as ready for review November 14, 2024 14:09
@sayboras sayboras requested a review from a team as a code owner November 14, 2024 14:09
sayboras added a commit to cilium/cilium that referenced this pull request Nov 14, 2024
Relates: cilium/proxy#998
Signed-off-by: Tam Mach <tam.mach@cilium.io>
Copy link
Member

@jrajahalme jrajahalme left a comment

Choose a reason for hiding this comment

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

Thanks for the lift :-)

@jrajahalme jrajahalme added this pull request to the merge queue Nov 15, 2024
Merged via the queue into main with commit fb67566 Nov 15, 2024
5 checks passed
@jrajahalme jrajahalme deleted the pr/tammach/envoy-1.31 branch November 15, 2024 11:30
sayboras added a commit to cilium/cilium that referenced this pull request Nov 15, 2024
Relates: cilium/proxy#998
Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras added a commit to cilium/cilium that referenced this pull request Nov 15, 2024
Relates: cilium/proxy#998
Signed-off-by: Tam Mach <tam.mach@cilium.io>
sayboras added a commit that referenced this pull request Nov 15, 2024
sayboras added a commit that referenced this pull request Nov 18, 2024
github-merge-queue bot pushed a commit to cilium/cilium that referenced this pull request Nov 18, 2024
Relates: cilium/proxy#998
Signed-off-by: Tam Mach <tam.mach@cilium.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants