update cilium-{runtime,builder}

Signed-off-by: Martynas Pumputis <m@lambda.lt>
cilium · Aug 23, 2021 · 2122f94 · 2122f94
1 parent 274ce91
commit 2122f94
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build-images-ci.yaml b/.github/workflows/build-images-ci.yaml
@@ -103,7 +103,7 @@ jobs:
             quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:latest-race
             quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race
           build-args: |
-            BASE_IMAGE=quay.io/cilium/cilium-runtime:1784a5f918aa9415f963d5bed4c1c94a86c12dff@sha256:e99c7d068b109547795fdd3ce011d93cf6fd98a9bf7209bf41d34cea68634039
+            BASE_IMAGE=quay.io/cilium/cilium-runtime:0dd6d92c2f671861c9c3029baef31dc77c7e7282@sha256:be7f1cd3dfd4225837abce111384926388985e14d18e8bc8d243c5a198fa37c7
             LOCKDEBUG=1
             RACE=1
             OPERATOR_VARIANT=${{ matrix.name }}
@@ -152,7 +152,7 @@ jobs:
           tags: |
             quay.io/${{ github.repository_owner }}/${{ matrix.name }}-ci:${{ steps.tag.outputs.tag }}-race
           build-args: |
-            BASE_IMAGE=quay.io/cilium/cilium-runtime:1784a5f918aa9415f963d5bed4c1c94a86c12dff@sha256:e99c7d068b109547795fdd3ce011d93cf6fd98a9bf7209bf41d34cea68634039
+            BASE_IMAGE=quay.io/cilium/cilium-runtime:0dd6d92c2f671861c9c3029baef31dc77c7e7282@sha256:be7f1cd3dfd4225837abce111384926388985e14d18e8bc8d243c5a198fa37c7
             LOCKDEBUG=1
             RACE=1
             OPERATOR_VARIANT=${{ matrix.name }}

diff --git a/.travis.yml b/.travis.yml
@@ -16,14 +16,14 @@ jobs:
       if: type != pull_request
       env:
         - RACE=1
-        - BASE_IMAGE=quay.io/cilium/cilium-runtime:1784a5f918aa9415f963d5bed4c1c94a86c12dff@sha256:e99c7d068b109547795fdd3ce011d93cf6fd98a9bf7209bf41d34cea68634039
+        - BASE_IMAGE=quay.io/cilium/cilium-runtime:0dd6d92c2f671861c9c3029baef31dc77c7e7282@sha256:be7f1cd3dfd4225837abce111384926388985e14d18e8bc8d243c5a198fa37c7
         - LOCKDEBUG=1
     - arch: arm64-graviton2
       name: "arm64-graviton2-race"
       if: type != pull_request
       env:
         - RACE=1
-        - BASE_IMAGE=quay.io/cilium/cilium-runtime:1784a5f918aa9415f963d5bed4c1c94a86c12dff@sha256:e99c7d068b109547795fdd3ce011d93cf6fd98a9bf7209bf41d34cea68634039
+        - BASE_IMAGE=quay.io/cilium/cilium-runtime:0dd6d92c2f671861c9c3029baef31dc77c7e7282@sha256:be7f1cd3dfd4225837abce111384926388985e14d18e8bc8d243c5a198fa37c7
         - LOCKDEBUG=1
       virt: vm
       group: edge

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:64fa12f7fe71902a254339c147561ac35622e116@sha256:51c5fa17362aa62e92f5690f67ca5b18e1dd315cbd295e75cb50883f00bc7f80
+CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:af1415ff1a26fd5e93812b7c5af04c47795d38f5@sha256:08589f0ded935bf8f081baa95a22ff46f51548dceb27894dbd90d0b229c7f45a
 
 .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:6ed96e618f68cd941b62b546fc8d161db0144d84@sha256:5245610a830b14972d5b287fc0318ac6ab0d420e4afc9b5db9032a04fd706d32
-ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:1784a5f918aa9415f963d5bed4c1c94a86c12dff@sha256:e99c7d068b109547795fdd3ce011d93cf6fd98a9bf7209bf41d34cea68634039
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:0dd6d92c2f671861c9c3029baef31dc77c7e7282@sha256:be7f1cd3dfd4225837abce111384926388985e14d18e8bc8d243c5a198fa37c7
 ARG TESTER_IMAGE=quay.io/cilium/image-tester:eb76f0d4d585946bb0267b4c4478cceed17bbd87@sha256:c9a598cdc4843e62ab4e430f36343ca06d5292506261f17e466e0f1cbb48ddbb
 ARG GOLANG_IMAGE=docker.io/library/golang:1.17.0@sha256:634cda4edda00e59167e944cdef546e2d62da71ef1809387093a377ae3404df0
 ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:0147a23fdada32bd51b4f313c645bcb5fbe188d6@sha256:24fd3ad32471d0e45844c856c38f1b2d4ac8bd0a2d4edf64cffaaa3fd0b21202

diff --git a/images/cilium-test/Dockerfile b/images/cilium-test/Dockerfile
@@ -3,7 +3,7 @@
 # Copyright 2020-2021 Authors of Cilium
 # SPDX-License-Identifier: Apache-2.0
 
-ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:64fa12f7fe71902a254339c147561ac35622e116@sha256:51c5fa17362aa62e92f5690f67ca5b18e1dd315cbd295e75cb50883f00bc7f80
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:af1415ff1a26fd5e93812b7c5af04c47795d38f5@sha256:08589f0ded935bf8f081baa95a22ff46f51548dceb27894dbd90d0b229c7f45a
 ARG UBUNTU_IMAGE=docker.io/library/ubuntu:20.04@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93
 
 FROM ${UBUNTU_IMAGE} as rootfs

diff --git a/images/cilium/Dockerfile b/images/cilium/Dockerfile
@@ -3,8 +3,8 @@
 # Copyright 2020-2021 Authors of Cilium
 # SPDX-License-Identifier: Apache-2.0
 
-ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:64fa12f7fe71902a254339c147561ac35622e116@sha256:51c5fa17362aa62e92f5690f67ca5b18e1dd315cbd295e75cb50883f00bc7f80
-ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:1784a5f918aa9415f963d5bed4c1c94a86c12dff@sha256:e99c7d068b109547795fdd3ce011d93cf6fd98a9bf7209bf41d34cea68634039
+ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:af1415ff1a26fd5e93812b7c5af04c47795d38f5@sha256:08589f0ded935bf8f081baa95a22ff46f51548dceb27894dbd90d0b229c7f45a
+ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:0dd6d92c2f671861c9c3029baef31dc77c7e7282@sha256:be7f1cd3dfd4225837abce111384926388985e14d18e8bc8d243c5a198fa37c7
 
 # cilium-envoy from github.com/cilium/proxy
 #

diff --git a/jenkinsfiles/ginkgo-gke.Jenkinsfile b/jenkinsfiles/ginkgo-gke.Jenkinsfile
@@ -73,7 +73,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:1784a5f918aa9415f963d5bed4c1c94a86c12dff@sha256:e99c7d068b109547795fdd3ce011d93cf6fd98a9bf7209bf41d34cea68634039"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:0dd6d92c2f671861c9c3029baef31dc77c7e7282@sha256:be7f1cd3dfd4225837abce111384926388985e14d18e8bc8d243c5a198fa37c7"
                     }
                 }
             }

diff --git a/jenkinsfiles/ginkgo-kernel.Jenkinsfile b/jenkinsfiles/ginkgo-kernel.Jenkinsfile
@@ -90,7 +90,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:1784a5f918aa9415f963d5bed4c1c94a86c12dff@sha256:e99c7d068b109547795fdd3ce011d93cf6fd98a9bf7209bf41d34cea68634039"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:0dd6d92c2f671861c9c3029baef31dc77c7e7282@sha256:be7f1cd3dfd4225837abce111384926388985e14d18e8bc8d243c5a198fa37c7"
                     }
                 }
             }

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:1784a5f918aa9415f963d5bed4c1c94a86c12dff@sha256:e99c7d068b109547795fdd3ce011d93cf6fd98a9bf7209bf41d34cea68634039"; fi'
+                script: 'if [ "${run_with_race_detection}" = "" ]; then echo -n "scratch"; else echo -n "quay.io/cilium/cilium-runtime:0dd6d92c2f671861c9c3029baef31dc77c7e7282@sha256:be7f1cd3dfd4225837abce111384926388985e14d18e8bc8d243c5a198fa37c7"; fi'
             )}"""
     }
 

diff --git a/jenkinsfiles/kubernetes-upstream.Jenkinsfile b/jenkinsfiles/kubernetes-upstream.Jenkinsfile
@@ -53,7 +53,7 @@ pipeline {
                         env.DOCKER_TAG = env.DOCKER_TAG + "-race"
                         env.RACE = 1
                         env.LOCKDEBUG = 1
-                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:1784a5f918aa9415f963d5bed4c1c94a86c12dff@sha256:e99c7d068b109547795fdd3ce011d93cf6fd98a9bf7209bf41d34cea68634039"
+                        env.BASE_IMAGE = "quay.io/cilium/cilium-runtime:0dd6d92c2f671861c9c3029baef31dc77c7e7282@sha256:be7f1cd3dfd4225837abce111384926388985e14d18e8bc8d243c5a198fa37c7"
                     }
                 }
             }

diff --git a/test/k8sT/manifests/demo-customcalls.yaml b/test/k8sT/manifests/demo-customcalls.yaml
@@ -99,7 +99,7 @@ metadata:
 spec:
   containers:
   - name: cilium-builder
-    image: quay.io/cilium/cilium-builder:64fa12f7fe71902a254339c147561ac35622e116@sha256:51c5fa17362aa62e92f5690f67ca5b18e1dd315cbd295e75cb50883f00bc7f80
+    image: quay.io/cilium/cilium-builder:af1415ff1a26fd5e93812b7c5af04c47795d38f5@sha256:08589f0ded935bf8f081baa95a22ff46f51548dceb27894dbd90d0b229c7f45a
     workingDir: /cilium
     command: ["sleep"]
     args: