From e57e1723aadeb87c0e01dcf4b59361fa16762e59 Mon Sep 17 00:00:00 2001 From: Cilium Imagebot Date: Mon, 18 Sep 2023 08:49:49 +0000 Subject: [PATCH] images: update cilium-{runtime,builder} Signed-off-by: Cilium Imagebot --- .devcontainer/devcontainer.json | 2 +- .github/workflows/build-images-ci.yaml | 4 ++-- api/v1/Makefile | 2 +- images/builder/Dockerfile | 2 +- images/cilium/Dockerfile | 4 ++-- images/operator/Dockerfile | 2 +- test/k8s/manifests/demo-customcalls.yaml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 906c721550c4d..ab09eb6558a17 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,6 +1,6 @@ { "name": "Cilium", - "image": "quay.io/cilium/cilium-builder:c8ac3092070982eca667e7fbe0a319f925a97e02@sha256:0e50517f83ee1f775d74e05082e3830acf60a6d6486682e694f38bab131e7713", + "image": "quay.io/cilium/cilium-builder:3f94a291166286657c38a108d6eb092c5a603ab7@sha256:af052fdec4787a587aedbd79086952925e00ceff47dc6d25d62da09b6aacdbb9", "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 index 83c941a9a6349..96fe0f4396799 100644 --- a/.github/workflows/build-images-ci.yaml +++ b/.github/workflows/build-images-ci.yaml @@ -185,7 +185,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:55b2d1949c9fc9f6cd5c7b0f228b8cdbb712355d@sha256:c9f32811235fb39f6219f0231b83531ab77b87015738784378e8559ea3dbdc8b + BASE_IMAGE=quay.io/cilium/cilium-runtime:9de2fcfeb1fd12ffab099f48e2a2c7c8d4108c32@sha256:7b1ea7ac3241b473c5678f40554a1fa43b8bfe3170066d3ba3eca7b332df26d8 LOCKDEBUG=1 RACE=1 OPERATOR_VARIANT=${{ matrix.name }} @@ -319,7 +319,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:55b2d1949c9fc9f6cd5c7b0f228b8cdbb712355d@sha256:c9f32811235fb39f6219f0231b83531ab77b87015738784378e8559ea3dbdc8b + BASE_IMAGE=quay.io/cilium/cilium-runtime:9de2fcfeb1fd12ffab099f48e2a2c7c8d4108c32@sha256:7b1ea7ac3241b473c5678f40554a1fa43b8bfe3170066d3ba3eca7b332df26d8 LOCKDEBUG=1 RACE=1 OPERATOR_VARIANT=${{ matrix.name }} diff --git a/api/v1/Makefile b/api/v1/Makefile index 96e0fdcd1e2ac..ead8caed97a95 100644 --- 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:c8ac3092070982eca667e7fbe0a319f925a97e02@sha256:0e50517f83ee1f775d74e05082e3830acf60a6d6486682e694f38bab131e7713 +CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:3f94a291166286657c38a108d6eb092c5a603ab7@sha256:af052fdec4787a587aedbd79086952925e00ceff47dc6d25d62da09b6aacdbb9 .PHONY: proto proto: diff --git a/images/builder/Dockerfile b/images/builder/Dockerfile index 4baeee0a38896..12e4294b68729 100644 --- 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:55b2d1949c9fc9f6cd5c7b0f228b8cdbb712355d@sha256:c9f32811235fb39f6219f0231b83531ab77b87015738784378e8559ea3dbdc8b +ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:9de2fcfeb1fd12ffab099f48e2a2c7c8d4108c32@sha256:7b1ea7ac3241b473c5678f40554a1fa43b8bfe3170066d3ba3eca7b332df26d8 ARG TESTER_IMAGE=quay.io/cilium/image-tester:dd09c8d3ef349a909fbcdc99279516baef153f22@sha256:c056d064cb47c97acd607343db5457e1d49d9338d6d8a87e93e23cc93f052c73 ARG GOLANG_IMAGE=docker.io/library/golang:1.21.1@sha256:cffaba795c36f07e372c7191b35ceaae114d74c31c3763d442982e3a4df3b39e ARG CILIUM_LLVM_IMAGE=quay.io/cilium/cilium-llvm:a8c542efc076b62ba683e7699c0013adb6955f0f@sha256:38e8941107bd19eb30bdde6e478760a22325f38d1f2771dfd1b9af81d74235e7 diff --git a/images/cilium/Dockerfile b/images/cilium/Dockerfile index e8e948c0fbe46..e5ee8619fd1d9 100644 --- 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:c8ac3092070982eca667e7fbe0a319f925a97e02@sha256:0e50517f83ee1f775d74e05082e3830acf60a6d6486682e694f38bab131e7713 -ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:55b2d1949c9fc9f6cd5c7b0f228b8cdbb712355d@sha256:c9f32811235fb39f6219f0231b83531ab77b87015738784378e8559ea3dbdc8b +ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:3f94a291166286657c38a108d6eb092c5a603ab7@sha256:af052fdec4787a587aedbd79086952925e00ceff47dc6d25d62da09b6aacdbb9 +ARG CILIUM_RUNTIME_IMAGE=quay.io/cilium/cilium-runtime:9de2fcfeb1fd12ffab099f48e2a2c7c8d4108c32@sha256:7b1ea7ac3241b473c5678f40554a1fa43b8bfe3170066d3ba3eca7b332df26d8 # cilium-envoy from github.com/cilium/proxy # diff --git a/images/operator/Dockerfile b/images/operator/Dockerfile index ed533097fbb0d..9820d7e68cb49 100644 --- 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.1@sha256:cffaba795c36f07e372c7191b35ceaae114d74c31c3763d442982e3a4df3b39e ARG ALPINE_IMAGE=docker.io/library/alpine:3.18.3@sha256:7144f7bab3d4c2648d7e59409f15ec52a18006a128c733fcff20d3a4a54ba44a -ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:c8ac3092070982eca667e7fbe0a319f925a97e02@sha256:0e50517f83ee1f775d74e05082e3830acf60a6d6486682e694f38bab131e7713 +ARG CILIUM_BUILDER_IMAGE=quay.io/cilium/cilium-builder:3f94a291166286657c38a108d6eb092c5a603ab7@sha256:af052fdec4787a587aedbd79086952925e00ceff47dc6d25d62da09b6aacdbb9 # 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/test/k8s/manifests/demo-customcalls.yaml b/test/k8s/manifests/demo-customcalls.yaml index 268619bbb07dc..3d15f7dd07918 100644 --- 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:c8ac3092070982eca667e7fbe0a319f925a97e02@sha256:0e50517f83ee1f775d74e05082e3830acf60a6d6486682e694f38bab131e7713 + image: quay.io/cilium/cilium-builder:3f94a291166286657c38a108d6eb092c5a603ab7@sha256:af052fdec4787a587aedbd79086952925e00ceff47dc6d25d62da09b6aacdbb9 workingDir: /cilium command: ["/bin/sh", "-c"] args: