From 26a4af01801a865743d717d87bdfd045f3cab749 Mon Sep 17 00:00:00 2001 From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Date: Wed, 20 Nov 2024 10:52:21 +0000 Subject: [PATCH 1/6] cilium-1.16/1.16.4 package update Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> --- cilium-1.16.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cilium-1.16.yaml b/cilium-1.16.yaml index 8f81b90568db..1ef45d6f7894 100644 --- a/cilium-1.16.yaml +++ b/cilium-1.16.yaml @@ -1,8 +1,8 @@ #nolint:valid-pipeline-git-checkout-commit,valid-pipeline-git-checkout-tag package: name: cilium-1.16 - version: 1.16.3 - epoch: 1 + version: 1.16.4 + epoch: 0 description: Cilium is a networking, observability, and security solution with an eBPF-based dataplane copyright: - license: Apache-2.0 @@ -69,7 +69,7 @@ pipeline: with: repository: https://github.com/cilium/cilium tag: v${{package.version}} - expected-commit: f221719170636b0e0da2c7b8227c18967a1201c8 + expected-commit: 0380724290f01576aa053c2c2ad35532063c695e - uses: go/bump with: From 24a73afdb18ba797082dba5e8c95d1ba85756705 Mon Sep 17 00:00:00 2001 From: Debasish Biswas Date: Wed, 20 Nov 2024 17:13:57 +0530 Subject: [PATCH 2/6] Update cilium proxy commit SHA Signed-off-by: Debasish Biswas --- cilium-1.16.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cilium-1.16.yaml b/cilium-1.16.yaml index 1ef45d6f7894..e1906117f91d 100644 --- a/cilium-1.16.yaml +++ b/cilium-1.16.yaml @@ -62,7 +62,7 @@ environment: vars: # https://github.com/cilium/cilium/blob/v1.15.6/images/cilium/Dockerfile - CILIUM_PROXY_COMMIT: "0d05e48bfbb8c4737ec40d5781d970a550ed2bbd" + CILIUM_PROXY_COMMIT: "97edc2815e2c6a174d3d12e71731d54f5d32ea16" pipeline: - uses: git-checkout From 1b62ef1bd1aa189396cecf2b2c3ddafedbb5541f Mon Sep 17 00:00:00 2001 From: Debasish Biswas Date: Wed, 20 Nov 2024 17:21:50 +0530 Subject: [PATCH 3/6] Update cilium/proxy branch to v1.30 Signed-off-by: Debasish Biswas --- cilium-1.16.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cilium-1.16.yaml b/cilium-1.16.yaml index e1906117f91d..0a10710265f1 100644 --- a/cilium-1.16.yaml +++ b/cilium-1.16.yaml @@ -109,7 +109,7 @@ pipeline: # Branch from https://github.com/cilium/cilium/blob/v1.15.5/images/cilium/Dockerfile # Note often the branch is updated with dependencies updates, no tags # See CILIUM_PROXY_COMMIT for anchor point - branch: v1.29 + branch: v1.30 depth: 1000 destination: envoy From f685eb97afc4c45c9301eac239934ba8a1fce732 Mon Sep 17 00:00:00 2001 From: debasishbsws Date: Thu, 21 Nov 2024 11:37:37 +0000 Subject: [PATCH 4/6] Remove the unnessury patch, Refactor the envoy proxy build pipeline Signed-off-by: debasishbsws --- cilium-1.16.yaml | 45 +++++++++++++++++++++-------------------- cilium-envoy-proxy.yaml | 0 2 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 cilium-envoy-proxy.yaml diff --git a/cilium-1.16.yaml b/cilium-1.16.yaml index 0a10710265f1..df252c4b870b 100644 --- a/cilium-1.16.yaml +++ b/cilium-1.16.yaml @@ -54,6 +54,7 @@ environment: - llvm17-dev - mpc-dev - openjdk-11 + - openjdk-11-default-jvm - openssf-compiler-options - patch - python3-dev @@ -120,41 +121,41 @@ pipeline: with: patches: toolchains-paths.patch - - uses: patch - with: - patches: envoy-55b0fc45cfdc2c0df002690606853540cf794fab.patch - - - runs: | - # Bazel errors out on toolchain stanza - sed -i '/$toolchain /d' go.mod - # Bazel errors out on go point release - sed -i 's|^\(go 1\.[0-9]*\)\.[0-9]*|\1|' go.mod - - runs: | cd /home/build/envoy/proxylib make mkdir -p ${{targets.destdir}}/usr/lib cp -v libcilium.so ${{targets.destdir}}/usr/lib/libcilium.so - cd /home/build/envoy - # The Python interpreter complains about being run as root, there's a flag to pass to disable that warning. + - working-directory: envoy + runs: | + # Fix(build): The Python interpreter complains about being run as root, there's a flag to pass to disable that warning. sed -i 's/envoy_dependencies_extra()/envoy_dependencies_extra(ignore_root_user_error=True)/g' WORKSPACE - export JAVA_HOME=/usr/lib/jvm/java-11-openjdk + mkdir -p .cache/bazel/_bazel_root ./bazel/setup_clang.sh /usr mkdir -p ${{targets.destdir}}/usr/bin + bazel build --fission=no --config=clang \ + --discard_analysis_cache \ + --nokeep_state_after_build \ + --notrack_incremental_state \ + --conlyopt="-Wno-strict-prototypes" \ + --verbose_failures -c opt //:cilium-envoy-starter + + cp -v bazel-bin/cilium-envoy-starter ${{targets.destdir}}/usr/bin/cilium-envoy-starter + + - working-directory: envoy + runs: | + bazel build --fission=no --config=clang \ + --discard_analysis_cache \ + --nokeep_state_after_build \ + --notrack_incremental_state \ + --conlyopt="-Wno-strict-prototypes" \ + --verbose_failures -c opt //:cilium-envoy - for target in cilium-envoy-starter cilium-envoy; do - bazel build --fission=no --config=clang \ - --discard_analysis_cache \ - --nokeep_state_after_build \ - --notrack_incremental_state \ - --conlyopt="-Wno-strict-prototypes" \ - --verbose_failures -c opt //:${target} - cp -v bazel-bin/${target} ${{targets.destdir}}/usr/bin/${target} - done + cp -v bazel-bin/cilium-envoy ${{targets.destdir}}/usr/bin/cilium-envoy - uses: strip diff --git a/cilium-envoy-proxy.yaml b/cilium-envoy-proxy.yaml new file mode 100644 index 000000000000..e69de29bb2d1 From ad4bffb19a4180b5da11691b019a1383e7b29ef3 Mon Sep 17 00:00:00 2001 From: Debasish Biswas Date: Thu, 21 Nov 2024 17:10:44 +0530 Subject: [PATCH 5/6] Delete cilium-envoy-proxy.yaml Signed-off-by: Debasish Biswas --- cilium-envoy-proxy.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 cilium-envoy-proxy.yaml diff --git a/cilium-envoy-proxy.yaml b/cilium-envoy-proxy.yaml deleted file mode 100644 index e69de29bb2d1..000000000000 From f9240ded8298178e44d1a9fcd8e60eec48d75498 Mon Sep 17 00:00:00 2001 From: Nghia Tran Date: Tue, 10 Dec 2024 01:07:22 -0500 Subject: [PATCH 6/6] use gcc 13 --- cilium-1.16.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cilium-1.16.yaml b/cilium-1.16.yaml index df252c4b870b..a74a3fdc5f88 100644 --- a/cilium-1.16.yaml +++ b/cilium-1.16.yaml @@ -40,8 +40,8 @@ environment: - clang-17-dev - cmake - coreutils # for GNU install - # We need to stick to gcc 12 for now, envoy doesn't build with gcc >= 13 - - gcc-12-default + # We need to stick to gcc 13 for now, envoy doesn't build with gcc >= 13 + - gcc-13-default - git - go - grep