images: update cilium-{runtime,builder}

Signed-off-by: Cilium Imagebot <noreply@cilium.io>
cilium · Jan 24, 2023 · 1172a07 · 1172a07
1 parent a1046bc
commit 1172a07
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build-images-ci.yaml b/.github/workflows/build-images-ci.yaml
@@ -174,7 +174,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:6c94d6c607d0b85c8416b74680410a6d220edf28@sha256:3f22be7b1c004545b5394be6e9331bebd850771c4643d3fdae4e39dfa53d99f0
+            BASE_IMAGE=quay.io/cilium/cilium-runtime:ae79224411f92933918659b6bebd0f4a318351f1@sha256:9338b471e9df4427b049d79b7889fe35a89e013eb7ddabfba2a5577122ead450
             LOCKDEBUG=1
             RACE=1
             OPERATOR_VARIANT=${{ matrix.name }}
@@ -289,7 +289,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:6c94d6c607d0b85c8416b74680410a6d220edf28@sha256:3f22be7b1c004545b5394be6e9331bebd850771c4643d3fdae4e39dfa53d99f0
+            BASE_IMAGE=quay.io/cilium/cilium-runtime:ae79224411f92933918659b6bebd0f4a318351f1@sha256:9338b471e9df4427b049d79b7889fe35a89e013eb7ddabfba2a5577122ead450
             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:a14ed96c8663a40349fa3a31b8ea127e1db1598e@sha256:893c7414c063538930d83db806af234e80e0fd88c97f6dfb95df2274dc599fad
+CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:ed2947b8ba3ec68e56e3cd1818aa58f284592d7e@sha256:c6672a633834b8a253e763eee13f4cc3e84dce9d4c2929beb68215894e5ef69b
 
 .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:6c94d6c607d0b85c8416b74680410a6d220edf28@sha256:3f22be7b1c004545b5394be6e9331bebd850771c4643d3fdae4e39dfa53d99f0
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:ae79224411f92933918659b6bebd0f4a318351f1@sha256:9338b471e9df4427b049d79b7889fe35a89e013eb7ddabfba2a5577122ead450
 ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73
 ARG GOLANG_IMAGE=docker.io/library/golang:1.19.5@sha256:bb9811fad43a7d6fd2173248d8331b2dcf5ac9af20976b1937ecd214c5b8c383
 ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:3408daa17f6490a464dfc746961e28ae31964c66@sha256:ff13a1a9f973d102c6ac907d2bc38a524c8e1d26c6c1b16ed809a98925206a79

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:a14ed96c8663a40349fa3a31b8ea127e1db1598e@sha256:893c7414c063538930d83db806af234e80e0fd88c97f6dfb95df2274dc599fad
-ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:6c94d6c607d0b85c8416b74680410a6d220edf28@sha256:3f22be7b1c004545b5394be6e9331bebd850771c4643d3fdae4e39dfa53d99f0
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:ed2947b8ba3ec68e56e3cd1818aa58f284592d7e@sha256:c6672a633834b8a253e763eee13f4cc3e84dce9d4c2929beb68215894e5ef69b
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:ae79224411f92933918659b6bebd0f4a318351f1@sha256:9338b471e9df4427b049d79b7889fe35a89e013eb7ddabfba2a5577122ead450
 
 # cilium-envoy from github.com/cilium/proxy
 #

diff --git a/jenkinsfiles/ginkgo-gke.Jenkinsfile b/jenkinsfiles/ginkgo-gke.Jenkinsfile
@@ -80,7 +80,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:6c94d6c607d0b85c8416b74680410a6d220edf28@sha256:3f22be7b1c004545b5394be6e9331bebd850771c4643d3fdae4e39dfa53d99f0"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:ae79224411f92933918659b6bebd0f4a318351f1@sha256:9338b471e9df4427b049d79b7889fe35a89e013eb7ddabfba2a5577122ead450"
                     }
                 }
             }

diff --git a/jenkinsfiles/ginkgo-kernel.Jenkinsfile b/jenkinsfiles/ginkgo-kernel.Jenkinsfile
@@ -97,7 +97,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:6c94d6c607d0b85c8416b74680410a6d220edf28@sha256:3f22be7b1c004545b5394be6e9331bebd850771c4643d3fdae4e39dfa53d99f0"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:ae79224411f92933918659b6bebd0f4a318351f1@sha256:9338b471e9df4427b049d79b7889fe35a89e013eb7ddabfba2a5577122ead450"
                     }
                 }
             }

diff --git a/jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile b/jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile
@@ -34,7 +34,7 @@ pipeline {
             )}"""
         BASE_IMAGE="""${sh(
                 returnStdout: true,
-                script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:6c94d6c607d0b85c8416b74680410a6d220edf28@sha256:3f22be7b1c004545b5394be6e9331bebd850771c4643d3fdae4e39dfa53d99f0"; fi'
+                script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:ae79224411f92933918659b6bebd0f4a318351f1@sha256:9338b471e9df4427b049d79b7889fe35a89e013eb7ddabfba2a5577122ead450"; fi'
             )}"""
     }
 

diff --git a/jenkinsfiles/kubernetes-upstream.Jenkinsfile b/jenkinsfiles/kubernetes-upstream.Jenkinsfile
@@ -60,7 +60,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:6c94d6c607d0b85c8416b74680410a6d220edf28@sha256:3f22be7b1c004545b5394be6e9331bebd850771c4643d3fdae4e39dfa53d99f0"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:ae79224411f92933918659b6bebd0f4a318351f1@sha256:9338b471e9df4427b049d79b7889fe35a89e013eb7ddabfba2a5577122ead450"
                     }
                 }
             }

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:a14ed96c8663a40349fa3a31b8ea127e1db1598e@sha256:893c7414c063538930d83db806af234e80e0fd88c97f6dfb95df2274dc599fad
+    image: quay.io/cilium/cilium-builder:ed2947b8ba3ec68e56e3cd1818aa58f284592d7e@sha256:c6672a633834b8a253e763eee13f4cc3e84dce9d4c2929beb68215894e5ef69b
     workingDir: /cilium
     command: ["sleep"]
     args: