RC1 for Cilium 1.15

.github/actions/build_cilium-envoy/action.yaml

@@ -31,11 +31,9 @@ runs:
           wget \
           zip \
           software-properties-common
-        wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+        wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc > /dev/null
         sudo apt-add-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
         sudo apt-get update
-        sudo apt-get install -y --no-install-recommends \
-          clang-17 clang-tools-17 llvm-17-dev lldb-17 lld-17 clang-format-17 libc++-17-dev libc++abi-17-dev
 
     - name: Download cilium/proxy
       shell: bash
@@ -44,6 +42,12 @@ runs:
         curl -sSLf https://github.com/cilium/proxy/archive/${{ inputs.cilium-proxy_version }}.tar.gz | \
           tar zxf - --strip-components 1 -C cilium/src/cilium-proxy
 
+    - name: Setup Clang
+      shell: bash
+      working-directory: cilium/src/cilium-proxy
+      run: |
+        make clang.bazelrc
+
     - name: Build libcilium.so
       shell: bash
       run: |
@@ -54,7 +58,8 @@ runs:
     - name: Build cilium-envoy
       shell: bash
       env:
-        BAZEL_BUILD_OPTS: "--remote_upload_local_results=false --disk_cache=/tmp/bazel-cache --verbose_failures"
+        # https://github.com/envoyproxy/envoy/issues/34368
+        BAZEL_BUILD_OPTS: "--remote_upload_local_results=false --disk_cache=/tmp/bazel-cache --verbose_failures --copt=--gcc-install-dir=/usr/lib/gcc/x86_64-linux-gnu/11"
         PKG_BUILD: 1
         DESTDIR: /tmp/install
       run: |
@@ -68,4 +73,3 @@ runs:
         make install
         sudo mv /tmp/install/usr/bin/cilium-envoy ../workspace/usr/bin/
         sudo mv /tmp/install/usr/bin/cilium-envoy-starter ../workspace/usr/bin/
-

.github/actions/build_cilium-image-tools/action.yaml

@@ -81,15 +81,3 @@ runs:
       sudo images/bpftool/checkout-linux.sh
       sudo images/bpftool/build-bpftool-native.sh
       sudo mv /out/linux/amd64/bin/bpftool ../workspace/usr/local/bin/
-
-  - name: Build iproute2
-    shell: bash
-    run: |
-      cd cilium/src/image-tools
-      sed -i -e "s/libbpf-/cilium-libbpf-/g" images/iproute2/checkout-libbpf.sh
-      sudo images/iproute2/checkout-libbpf.sh
-      sudo images/iproute2/build-libbpf-native.sh
-      sudo images/iproute2/checkout-iproute2.sh
-      sudo images/iproute2/build-iproute2-native.sh
-      sudo mv /out/linux/amd64/lib64/libbpf* ../workspace/usr/lib/
-      sudo mv /out/linux/amd64/bin/ip /out/linux/amd64/bin/tc /out/linux/amd64/bin/ss ../workspace/usr/local/bin/

.github/workflows/main.yaml

@@ -307,5 +307,5 @@ jobs:
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         yamory_token: ${{ secrets.YAMORY_ACCESS_TOKEN }}
-        cilium-proxy_version: 39a2a56bbd5b3a591f69dbca51d3e30ef97e0e51
-        image-tools_version: ff22ba3bff1010f4a2dd76ede789663c3beaf8d2
+        cilium-proxy_version: 97edc2815e2c6a174d3d12e71731d54f5d32ea16
+        image-tools_version: de666b61919632fb1e91fcf6259531f6bee467ee

cilium/BRANCH

@@ -1 +1 @@
-1.14
+1.15

cilium/Dockerfile

@@ -95,4 +95,4 @@ RUN apt-get update \
 WORKDIR /home/cilium
 
 ENV INITSYSTEM="SYSTEMD"
-ENTRYPOINT ["/usr/bin/cilium"]
+ENTRYPOINT ["/usr/bin/cilium-dbg"]

cilium/TAG

@@ -1 +1 @@
-1.14.14.1
+1.15.11.1-rc.1

maintenance.md

@@ -336,7 +336,7 @@ follow these steps.
 ![Regular Update](./regular_update.svg)
 
 1. Check the [releases](https://github.com/cilium/cilium/releases) page for changes.
-2. If necessary, update `cilium-proxy_version` and `image-tools_version` parameters in the `.github/workflows/cilium.yaml`.
+2. If necessary, update `cilium-proxy_version` and `image-tools_version` parameters in the `.github/workflows/main.yaml`.
    1. The `version` for envoy is referenced in the Dockerfile for `cilium` in the source repository and is a commit hash from [cilium/proxy](https://github.com/cilium/proxy)
    2. Check the upstream Dockerfile and update the `.github/actions/build_cilium-envoy/action.yaml` as needed.
       - [Dockerfile.builder](https://github.com/cilium/proxy/blob/master/Dockerfile.builder) that includes installation of dependencies and Bazel.
@@ -346,7 +346,6 @@ follow these steps.
       - [compilers/Dockerfile](https://github.com/cilium/image-tools/blob/master/images/compilers/Dockerfile) that includes installation of dependencies.
       - [bpftool/Dockerfile](https://github.com/cilium/image-tools/blob/master/images/bpftool/Dockerfile)
       - [llvm/Dockerfile](https://github.com/cilium/image-tools/blob/master/images/llvm/Dockerfile)
-      - [iproute2/Dockerfile](https://github.com/cilium/image-tools/blob/master/images/iproute2/Dockerfile)
 3. Check the upstream Dockerfile. If there are any updates, update our `Dockerfile`.
    - `https://github.com/cilium/cilium/blob/vX.Y.Z/images/cilium/Dockerfile`
 4. Check whether manually applied patches have been included in the new release and remove them accordingly.