Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backports: for v1.8.3 #521

Merged
merged 5 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-10-08T16:19:09Z by kres 34e72ac.
# Generated on 2024-11-12T16:16:32Z by kres c0e2b63.

name: default
concurrency:
Expand Down Expand Up @@ -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.1
options: --privileged
ports:
- 1234:1234
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
- default
services:
buildkitd:
image: moby/buildkit:v0.16.0
image: moby/buildkit:v0.17.1
options: --privileged
ports:
- 1234:1234
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/weekly.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-10-08T16:19:09Z by kres 34e72ac.
# Generated on 2024-11-12T16:16:32Z by kres c0e2b63.

name: weekly
concurrency:
Expand All @@ -16,7 +16,7 @@ jobs:
- pkgs
services:
buildkitd:
image: moby/buildkit:v0.16.0
image: moby/buildkit:v0.17.1
options: --privileged
ports:
- 1234:1234
Expand Down
2 changes: 1 addition & 1 deletion .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
- name: EXTENSIONS_IMAGE_REF
defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
- name: PKGS
defaultValue: v1.8.0-24-ge72b2f4
defaultValue: v1.8.0-31-g9c80a4a
- name: PKGS_PREFIX
defaultValue: ghcr.io/siderolabs
useBldrPkgTagResolver: true
Expand Down
14 changes: 12 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-10-28T11:40:02Z by kres 6d3cad4.
# Generated on 2024-11-12T16:16:32Z by kres c0e2b63.

# common variables

Expand Down Expand Up @@ -41,14 +41,15 @@ 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)"

# extra variables

EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
PKGS ?= v1.8.0-24-ge72b2f4
PKGS ?= v1.8.0-31-g9c80a4a
PKGS_PREFIX ?= ghcr.io/siderolabs

# targets defines all the available targets
Expand Down Expand Up @@ -164,6 +165,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) DEST=$(DEST) bash -c '\
for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \
echo $$platform; \
directory="$${platform//\//_}"; \
if [[ -d "$$DEST/$$directory" ]]; then \
mv "$$DEST/$$directory/"* $$DEST; \
rmdir "$$DEST/$$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)"
Expand Down
2 changes: 1 addition & 1 deletion Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
format: v1alpha2

vars:
LINUX_FIRMWARE_VERSION: "20241017" # update this when updating PKGS_VERSION in Makefile
LINUX_FIRMWARE_VERSION: "20241110" # update this when updating PKGS_VERSION in Makefile
DRBD_DRIVER_VERSION: 9.2.11 # update this when updating PKGS_VERSION in Makefile
ZFS_DRIVER_VERSION: 2.2.6 # update this when updating PKGS_VERSION in Makefile
UTIL_LINUX_VERSION: 2.40.2 # update this when updating PKGS_VERSION in Makefile
Expand Down
4 changes: 2 additions & 2 deletions firmware/intel-ucode/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ steps:
- sources:
- url: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/refs/tags/microcode-{{ .INTEL_UCODE_VERSION }}.tar.gz
destination: intel-ucode.tar.gz
sha256: 8b7582eac7e9a691356e18b3bdcbc7b2db09494e040ec980a4a5fb6d0da261bf
sha512: d996de4f045df33f4eb1a1dabfb2f55bd8941e8dc16241d7a6c361216f4b87b88c34ba57c88ee4d4b7b3cf2b3fac937c43806191681df031fa3d5cdd677a86fe
sha256: 1cae9cde48fb44444ed40ce045c34a1debbc8cfff3fb84e44c62798459f818c3
sha512: 4050fd6fc6d42a8188368c3dd7a83183d4184bdd6459491e414c4aa12989ca5e2dd9ba01b2fba76cb86fc40f7428614aa262227945128d97d39544e512c37642
prepare:
- |
sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml
Expand Down
2 changes: 1 addition & 1 deletion firmware/vars.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# renovate: datasource=github-releases extractVersion=^microcode-(?<version>.*)$ depName=intel/Intel-Linux-Processor-Microcode-Data-Files
INTEL_UCODE_VERSION: 20240910
INTEL_UCODE_VERSION: 20241029
2 changes: 1 addition & 1 deletion guest-agents/vars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ PCRE2_VERSION: 10.42
# renovate: datasource=git-tags depName=https://gitlab.com/xen-project/xen-guest-agent.git
XEN_GUEST_AGENT_VERSION: 0.4.0
# renovate: datasource=github-releases depName=siderolabs/talos-vmtoolsd
TALOS_VMTOOLSD_VERSION: v0.6.0
TALOS_VMTOOLSD_VERSION: v0.6.1
9 changes: 8 additions & 1 deletion hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ github_repo = "siderolabs/extensions"
match_deps = "^github.com/((talos-systems|siderolabs)/[a-zA-Z0-9-]+)$"

# previous release
previous = "v1.8.1"
previous = "v1.8.2"

pre_release = false

Expand All @@ -16,5 +16,12 @@ See [Talos Linux documentation](https://www.talos.dev/v1.8/talos-guides/configur

[notes]

[notes.updates]
title = "Component Updates"
description = """\
* Intel microcode: 20241029
* Linux Firmware: 20241110
* vmtoolsd-guest-agent: v0.6.1
"""

[make_deps]
3 changes: 1 addition & 2 deletions nvidia-gpu/nvidia-fabricmanager/production/lts/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ steps:
cp bin/nv-fabricmanager /rootfs/usr/local/bin/
cp bin/nvswitch-audit /rootfs/usr/local/bin/

cp share/nvidia/nvswitch/dgx2_hgx2_topology /rootfs/usr/local/share/nvidia/nvswitch/
cp share/nvidia/nvswitch/dgxa100_hgxa100_topology /rootfs/usr/local/share/nvidia/nvswitch/
cp share/nvidia/nvswitch/* /rootfs/usr/local/share/nvidia/nvswitch/

cp etc/fabricmanager.cfg /rootfs/usr/local/share/nvidia/nvswitch/

Expand Down
2 changes: 1 addition & 1 deletion nvidia-gpu/vars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ CONTAINER_TOOLKIT_REF: a470818ba7d9166be282cd0039dd2fc9b0a34d73
LIBNVIDIA_CONTAINER_VERSION: v1.16.1
LIBNVIDIA_CONTAINER_REF: 4c2494f16573b585788a42e9c7bee76ecd48c73d
# renovate: datasource=docker versioning=docker depName=cgr.dev/chainguard/wolfi-base
WOLFI_BASE_REF: sha256:72c8bfed3266b2780243b144dc5151150015baf5a739edbbde53d154574f1607
WOLFI_BASE_REF: sha256:0c1bf69476e3ca3d4763ca3067773e8796a1faecd56678a3b748cd90cfb9b9a5
# renovate: datasource=git-tags extractVersion=^glibc-(?<version>.*)$ depName=https://sourceware.org/git/glibc.git
GLIBC_VERSION: 2.40
# renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=seccomp/libseccomp
Expand Down