From 8b0bd608e791eda0ce0d64f9ec541d4c33ba8de0 Mon Sep 17 00:00:00 2001 From: Nashwan Azhari Date: Fri, 20 Dec 2024 13:49:33 +0200 Subject: [PATCH] cilium-operator-generic:1.16.5: hack envoy dependency version. Signed-off-by: Nashwan Azhari --- 1.16.5/cilium/rockcraft.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/1.16.5/cilium/rockcraft.yaml b/1.16.5/cilium/rockcraft.yaml index 05dc2a3..0126fb2 100644 --- a/1.16.5/cilium/rockcraft.yaml +++ b/1.16.5/cilium/rockcraft.yaml @@ -84,11 +84,18 @@ parts: # Workaround for bazel python plugin/bits to ignore running as root sed -i -e 's/envoy_dependencies_extra()/envoy_dependencies_extra(ignore_root_user_error=True)/g' WORKSPACE + # HACK(aznashwan): there was a known bug in `google/cel-cpp`. + # cel-cpp is imported by `envoyproxy` itself, which is imported by `cilium/proxy`. + # https://github.com/envoyproxy/envoy/issues/34368 + # https://github.com/envoyproxy/envoy/pull/36940 + sed -i -e 's/ENVOY_SHA = ".*"/ENVOY_SHA = "718992323adc3dac4436af5ad4818a196a49d508"' WORKSPACE + make -C proxylib all mkdir -p $CRAFT_PART_INSTALL/usr/lib/ cp proxylib/libcilium.so $CRAFT_PART_INSTALL/usr/lib/ cp proxylib/libcilium.so /usr/lib/ git rev-parse HEAD >SOURCE_VERSION + # TODO(aznashwan): broken make bazel-bin/cilium-envoy make install rm -rf /root/.cache/bazel