From e3012b8e6ca4b49351c5385d74e8e8119f7532fb Mon Sep 17 00:00:00 2001 From: Utku Ozdemir Date: Thu, 7 Nov 2024 00:14:34 +0100 Subject: [PATCH] chore: add `metal-agent` into readme and reproducibility, rekres Add some missing things: - Add `metal-agent` to README - Add it to the reproducibility build - Rekres Signed-off-by: Utku Ozdemir --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/weekly.yaml | 4 ++-- Makefile | 12 +++++++++++- README.md | 13 +++++++------ reproducibility/pkg.yaml | 1 + 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8cc52cc4..9b7d5ab7 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 2024-10-15T11:50:44Z by kres 34e72ac. +# Generated on 2024-11-06T23:11:48Z by kres 1fc767a. name: default concurrency: @@ -33,7 +33,7 @@ jobs: labels: ${{ steps.retrieve-pr-labels.outputs.result }} services: buildkitd: - image: moby/buildkit:v0.16.0 + image: moby/buildkit:v0.17.0 options: --privileged ports: - 1234:1234 @@ -143,7 +143,7 @@ jobs: - default services: buildkitd: - image: moby/buildkit:v0.16.0 + image: moby/buildkit:v0.17.0 options: --privileged ports: - 1234:1234 diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml index ea020545..d63a8361 100644 --- a/.github/workflows/weekly.yaml +++ b/.github/workflows/weekly.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-10-15T11:50:44Z by kres 34e72ac. +# Generated on 2024-11-06T23:11:48Z by kres 1fc767a. name: weekly concurrency: @@ -16,7 +16,7 @@ jobs: - pkgs services: buildkitd: - image: moby/buildkit:v0.16.0 + image: moby/buildkit:v0.17.0 options: --privileged ports: - 1234:1234 diff --git a/Makefile b/Makefile index 45515089..43a4b876 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-10-30T12:38:48Z by kres 6d3cad4. +# Generated on 2024-11-06T23:11:48Z by kres 1fc767a. # common variables @@ -41,6 +41,7 @@ COMMON_ARGS += --provenance=false COMMON_ARGS += --progress=$(PROGRESS) COMMON_ARGS += --platform=$(PLATFORM) COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) +COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=1 COMMON_ARGS += --build-arg=TAG="$(TAG)" COMMON_ARGS += --build-arg=PKGS="$(PKGS)" COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)" @@ -167,6 +168,15 @@ target-%: ## Builds the specified target defined in the Pkgfile. The build resu local-%: ## Builds the specified target defined in the Pkgfile using the local output type. The build result will be output to the specified local destination. @$(MAKE) target-$* TARGET_ARGS="--output=type=local,dest=$(DEST) $(TARGET_ARGS)" + @PLATFORM=$(PLATFORM) ARTIFACTS=$(ARTIFACTS) bash -c '\ + for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \ + echo $$platform; \ + directory="$${platform//\//_}"; \ + if [[ -d "$$ARTIFACTS/$$directory" ]]; then \ + mv "$$ARTIFACTS/$$directory/"* $$ARTIFACTS; \ + rmdir "$$ARTIFACTS/$$directory/"; \ + fi; \ + done' docker-%: ## Builds the specified target defined in the Pkgfile using the docker output type. The build result will be loaded into Docker. @$(MAKE) target-$* TARGET_ARGS="$(TARGET_ARGS)" diff --git a/README.md b/README.md index f624fc39..770114bf 100644 --- a/README.md +++ b/README.md @@ -105,15 +105,16 @@ cosign verify --certificate-identity-regexp '@siderolabs\.com$' --certificate-oi | Name | Image | Description | Version Format | | ------------------------------- | --------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------- | ------------------ | -| [nut-client](power/nut-client/) | [ghcr.io/siderolabs/nut-client](https://github.com/siderolabs/talos-extensions/pkgs/container/nut-client) | [Network UPS Tools](https://networkupstools.org) upsmon client | `upstream version` | +| [nut-client](power/nut-client/) | [ghcr.io/siderolabs/nut-client](https://github.com/siderolabs/extensions/pkgs/container/nut-client) | [Network UPS Tools](https://networkupstools.org) upsmon client | `upstream version` | ### Guest Agents -| Name | Image | Description | Version Format | -| ---------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- | ------------------ | -| [qemu-guest-agent](guest-agents/qemu-guest-agent/) | [ghcr.io/siderolabs/qemu-guest-agent](https://github.com/siderolabs/talos-extensions/pkgs/container/qemu-guest-agent) | [QEMU Guest Agent](https://wiki.qemu.org/Features/GuestAgent) | `upstream version` | -| [xe-guest-utilities](guest-agents/xe-guest-utilities/) | [ghcr.io/siderolabs/xe-guest-utilities](https://github.com/siderolabs/talos-extensions/pkgs/container/xe-guest-utilities) | [xe-guest-utilities](https://github.com/xenserver/xe-guest-utilitiest) | `upstream version` | -| [vmtoolsd-guest-agent](guest-agents/vmtoolsd-guest-agent/) | [ghcr.io/siderolabs/vmtoolsd-guest-agent](https://github.com/siderolabs/talos-extensions/pkgs/container/vmtoolsd-guest-agent) | [talos-vmtoolsd](https://github.com/siderolabs/talos-vmtoolsd) | `upstream version` | +| Name | Image | Description | Version Format | +|------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------|--------------------| +| [metal-agent](guest-agents/metal-agent/) | [ghcr.io/siderolabs/metal-agent](https://github.com/siderolabs/extensions/pkgs/container/metal-agent) | [Talos Metal Agent](https://github.com/siderolabs/talos-metal-agent) | `upstream version` | +| [qemu-guest-agent](guest-agents/qemu-guest-agent/) | [ghcr.io/siderolabs/qemu-guest-agent](https://github.com/siderolabs/extensions/pkgs/container/qemu-guest-agent) | [QEMU Guest Agent](https://wiki.qemu.org/Features/GuestAgent) | `upstream version` | +| [xe-guest-utilities](guest-agents/xe-guest-utilities/) | [ghcr.io/siderolabs/xe-guest-utilities](https://github.com/siderolabs/extensions/pkgs/container/xe-guest-utilities) | [xe-guest-utilities](https://github.com/xenserver/xe-guest-utilitiest) | `upstream version` | +| [vmtoolsd-guest-agent](guest-agents/vmtoolsd-guest-agent/) | [ghcr.io/siderolabs/vmtoolsd-guest-agent](https://github.com/siderolabs/extensions/pkgs/container/vmtoolsd-guest-agent) | [talos-vmtoolsd](https://github.com/siderolabs/talos-vmtoolsd) | `upstream version` | ### NVIDIA GPU diff --git a/reproducibility/pkg.yaml b/reproducibility/pkg.yaml index 3584476a..f833b1d7 100644 --- a/reproducibility/pkg.yaml +++ b/reproducibility/pkg.yaml @@ -39,6 +39,7 @@ dependencies: # - stage: kata-containers - stage: lldpd - stage: mdadm + - stage: metal-agent # mei can be ignored from reproducibility test since it's kernel modules copied from pkgs # - stage: mei - stage: nut-client