From 668b65e3b4467386c8c34a4d139dc780fd7c80a2 Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <andrey.smirnov@siderolabs.com>
Date: Fri, 7 Mar 2025 14:02:11 +0400
Subject: [PATCH] chore: unify buildkits

Use same buildkit for all builds.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
---
 .github/workflows/ci.yaml | 13 ++-----------
 Makefile                  |  4 ++--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 882b45a..f749cfb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2025-01-15T13:38:09Z by kres 3b3f992.
+# Generated on 2025-03-07T10:02:10Z by kres d88db2f.
 
 name: default
 concurrency:
@@ -29,15 +29,6 @@ jobs:
       - self-hosted
       - pkgs
     if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/'))
-    services:
-      buildkitd:
-        image: moby/buildkit:v0.18.2
-        options: --privileged
-        ports:
-          - 1234:1234
-        volumes:
-          - /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit
-          - /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml
     steps:
       - name: gather-system-info
         id: system-info
@@ -77,7 +68,7 @@ jobs:
             - endpoint: tcp://buildkit-arm64.ci.svc.cluster.local:1234
               platforms: linux/arm64
           driver: remote
-          endpoint: tcp://127.0.0.1:1234
+          endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
       - name: Build
         if: github.event_name == 'pull_request'
         run: |
diff --git a/Makefile b/Makefile
index 2a075e5..8feef60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-08-08T15:42:07Z by kres dbf015a.
+# Generated on 2025-03-07T10:02:10Z by kres d88db2f.
 
 # common variables
 
@@ -25,7 +25,7 @@ SOURCE_DATE_EPOCH := $(shell git log $(INITIAL_COMMIT_SHA) --pretty=%ct)
 
 # sync bldr image with pkgfile
 
-BLDR_RELEASE := v0.3.2
+BLDR_RELEASE := v0.4.1
 BLDR_IMAGE := ghcr.io/siderolabs/bldr:$(BLDR_RELEASE)
 BLDR := docker run --rm --user $(shell id -u):$(shell id -g) --volume $(PWD):/src --entrypoint=/bldr $(BLDR_IMAGE) --root=/src