images: update cilium-{runtime,builder}

Signed-off-by: Cilium Imagebot <noreply@cilium.io>
cilium · Mar 7, 2024 · 953f72b · 953f72b
1 parent 8eaa6cc
commit 953f72b
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "Cilium",
-  "image": "quay.io/cilium/cilium-builder:c201f37d71e37d47c113d0ef311a49635337a50d@sha256:43526595d9e423e2e4502ac6fec1085d3a93e3b82f873f89bd43ac34ef4a7730",
+  "image": "quay.io/cilium/cilium-builder:974369da7d9241da027f27815d7580023a444d3d@sha256:c3b18539326005190e2977945e3fc8c0660fced2048e152ec61d32579a27f3a8",
   "workspaceFolder": "/go/src/github.com/cilium/cilium",
   "workspaceMount": "source=${localWorkspaceFolder},target=/go/src/github.com/cilium/cilium,type=bind",
   "features": {

diff --git a/.github/workflows/build-images-ci.yaml b/.github/workflows/build-images-ci.yaml
@@ -145,7 +145,7 @@ jobs:
             quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race
           target: release
           build-args: |
-            BASE_IMAGE=quay.io/cilium/cilium-runtime:62164325d5459a61debf0c27b97cca5106508386@sha256:3d426f84aafa311cfdf3e7b219a9c4ad59350f8f995192836e3c953e50d6f7c9
+            BASE_IMAGE=quay.io/cilium/cilium-runtime:44f820035b04c6b922c8d9bf36314b8f501c9568@sha256:4b6b95424aa95201d10ab1ccdce16bd3426bf6efc23ce8f6a8289527e3899c74
             LOCKDEBUG=1
             RACE=1
             OPERATOR_VARIANT=${{ matrix.name }}
@@ -259,7 +259,7 @@ jobs:
             quay.io/${{ env.QUAY_ORGANIZATION_DEV }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race
           target: release
           build-args: |
-            BASE_IMAGE=quay.io/cilium/cilium-runtime:62164325d5459a61debf0c27b97cca5106508386@sha256:3d426f84aafa311cfdf3e7b219a9c4ad59350f8f995192836e3c953e50d6f7c9
+            BASE_IMAGE=quay.io/cilium/cilium-runtime:44f820035b04c6b922c8d9bf36314b8f501c9568@sha256:4b6b95424aa95201d10ab1ccdce16bd3426bf6efc23ce8f6a8289527e3899c74
             LOCKDEBUG=1
             RACE=1
             OPERATOR_VARIANT=${{ matrix.name }}

diff --git a/api/v1/Makefile b/api/v1/Makefile
@@ -3,7 +3,7 @@
 include ../../Makefile.defs
 
 # Update this via images/scripts/update-cilium-builder-image.sh
-CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:c201f37d71e37d47c113d0ef311a49635337a50d@sha256:43526595d9e423e2e4502ac6fec1085d3a93e3b82f873f89bd43ac34ef4a7730
+CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:974369da7d9241da027f27815d7580023a444d3d@sha256:c3b18539326005190e2977945e3fc8c0660fced2048e152ec61d32579a27f3a8
 
 .PHONY: proto
 proto:

diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 ARG COMPILERS_IMAGE=quay.io/cilium/image-compilers:5569a29cea6b3ad50aeb03102aaf3dc03841197c@sha256:b15dbedb7c49816c74a765e2f6ecdb9359763b8e4e4328d794f48b9cefae9804
-ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:62164325d5459a61debf0c27b97cca5106508386@sha256:3d426f84aafa311cfdf3e7b219a9c4ad59350f8f995192836e3c953e50d6f7c9
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:44f820035b04c6b922c8d9bf36314b8f501c9568@sha256:4b6b95424aa95201d10ab1ccdce16bd3426bf6efc23ce8f6a8289527e3899c74
 ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
 ARG GOLANG_IMAGE=docker.io/library/golang:1.21.8@sha256:c82d4ad02c062cf2b393bf0374df26638c6fed3dfe52cdbd3635d4a7befab86e
 ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:a8c542efc076b62ba683e7699c0013adb6955f0f@sha256:38e8941107bd19eb30bdde6e478760a22325f38d1f2771dfd1b9af81d74235e7

diff --git a/images/cilium/Dockerfile b/images/cilium/Dockerfile
@@ -1,8 +1,8 @@
 # Copyright Authors of Cilium
 # SPDX-License-Identifier: Apache-2.0
 
-ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:c201f37d71e37d47c113d0ef311a49635337a50d@sha256:43526595d9e423e2e4502ac6fec1085d3a93e3b82f873f89bd43ac34ef4a7730
-ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:62164325d5459a61debf0c27b97cca5106508386@sha256:3d426f84aafa311cfdf3e7b219a9c4ad59350f8f995192836e3c953e50d6f7c9
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:974369da7d9241da027f27815d7580023a444d3d@sha256:c3b18539326005190e2977945e3fc8c0660fced2048e152ec61d32579a27f3a8
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:44f820035b04c6b922c8d9bf36314b8f501c9568@sha256:4b6b95424aa95201d10ab1ccdce16bd3426bf6efc23ce8f6a8289527e3899c74
 
 # cilium-envoy from github.com/cilium/proxy
 #

diff --git a/images/operator/Dockerfile b/images/operator/Dockerfile
@@ -4,7 +4,7 @@
 ARG BASE_IMAGE=scratch
 ARG GOLANG_IMAGE=docker.io/library/golang:1.21.8@sha256:c82d4ad02c062cf2b393bf0374df26638c6fed3dfe52cdbd3635d4a7befab86e
 ARG ALPINE_IMAGE=docker.io/library/alpine:3.18.6@sha256:11e21d7b981a59554b3f822c49f6e9f57b6068bb74f49c4cd5cc4c663c7e5160
-ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:c201f37d71e37d47c113d0ef311a49635337a50d@sha256:43526595d9e423e2e4502ac6fec1085d3a93e3b82f873f89bd43ac34ef4a7730
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:974369da7d9241da027f27815d7580023a444d3d@sha256:c3b18539326005190e2977945e3fc8c0660fced2048e152ec61d32579a27f3a8
 
 # BUILDPLATFORM is an automatic platform ARG enabled by Docker BuildKit.
 # Represents the plataform where the build is happening, do not mix with

diff --git a/jenkinsfiles/kubernetes-upstream.Jenkinsfile b/jenkinsfiles/kubernetes-upstream.Jenkinsfile
@@ -59,7 +59,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:62164325d5459a61debf0c27b97cca5106508386@sha256:3d426f84aafa311cfdf3e7b219a9c4ad59350f8f995192836e3c953e50d6f7c9"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:44f820035b04c6b922c8d9bf36314b8f501c9568@sha256:4b6b95424aa95201d10ab1ccdce16bd3426bf6efc23ce8f6a8289527e3899c74"
                     }
                 }
             }

diff --git a/test/k8s/manifests/demo-customcalls.yaml b/test/k8s/manifests/demo-customcalls.yaml
@@ -99,7 +99,7 @@ metadata:
 spec:
   containers:
   - name: cilium-builder
-    image: quay.io/cilium/cilium-builder:c201f37d71e37d47c113d0ef311a49635337a50d@sha256:43526595d9e423e2e4502ac6fec1085d3a93e3b82f873f89bd43ac34ef4a7730
+    image: quay.io/cilium/cilium-builder:974369da7d9241da027f27815d7580023a444d3d@sha256:c3b18539326005190e2977945e3fc8c0660fced2048e152ec61d32579a27f3a8
     workingDir: /cilium
     command: ["/bin/sh", "-c"]
     args: