mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-09-21 22:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: update Linux to 6.12.23

Browse Source 
Also drop `extras` and use `talosctl-cni-bundle` from pkgs.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
This commit is contained in:
Andrey Smirnov 2025-04-11 20:46:54 +04:00
parent 892a6854d5
commit c55af59a25
No known key found for this signature in database
GPG Key ID: FE042E3D4085A811
9 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfile
View File

@ -4,7 +4,6 @@
ARG TOOLS=scratch ARG TOOLS=scratch
ARG PKGS=scratch ARG PKGS=scratch
ARG EXTRAS=scratch
ARG INSTALLER_ARCH=scratch ARG INSTALLER_ARCH=scratch
ARG DEBUG_TOOLS_SOURCE=scratch ARG DEBUG_TOOLS_SOURCE=scratch
@ -241,9 +240,7 @@ COPY --from=pkg-cni-arm64 /opt/cni/bin/host-local /opt/cni/bin/host-local
COPY --from=pkg-cni-arm64 /opt/cni/bin/loopback /opt/cni/bin/loopback COPY --from=pkg-cni-arm64 /opt/cni/bin/loopback /opt/cni/bin/loopback
COPY --from=pkg-cni-arm64 /opt/cni/bin/portmap /opt/cni/bin/portmap COPY --from=pkg-cni-arm64 /opt/cni/bin/portmap /opt/cni/bin/portmap
# Resolve package images using ${EXTRAS} to be used later in COPY --from=. FROM ${PKG_TALOSCTL_CNI_BUNDLE} AS pkgs-talosctl-cni-bundle
FROM ${PKG_TALOSCTL_CNI_BUNDLE} AS extras-talosctl-cni-bundle
# The tools target provides base toolchain for the build. # The tools target provides base toolchain for the build.
@ -337,13 +334,11 @@ ARG TAG
ARG ARTIFACTS ARG ARTIFACTS
ARG PKGS ARG PKGS
ARG TOOLS ARG TOOLS
ARG EXTRAS
RUN mkdir -p pkg/machinery/gendata/data && \ RUN mkdir -p pkg/machinery/gendata/data && \
echo -n ${NAME} > pkg/machinery/gendata/data/name && \ echo -n ${NAME} > pkg/machinery/gendata/data/name && \
echo -n ${SHA} > pkg/machinery/gendata/data/sha && \ echo -n ${SHA} > pkg/machinery/gendata/data/sha && \
echo -n ${USERNAME} > pkg/machinery/gendata/data/username && \ echo -n ${USERNAME} > pkg/machinery/gendata/data/username && \
echo -n ${REGISTRY} > pkg/machinery/gendata/data/registry && \ echo -n ${REGISTRY} > pkg/machinery/gendata/data/registry && \
echo -n ${EXTRAS} > pkg/machinery/gendata/data/extras && \
echo -n ${PKGS} > pkg/machinery/gendata/data/pkgs && \ echo -n ${PKGS} > pkg/machinery/gendata/data/pkgs && \
echo -n ${TOOLS} > pkg/machinery/gendata/data/tools && \ echo -n ${TOOLS} > pkg/machinery/gendata/data/tools && \
echo -n ${TAG} > pkg/machinery/gendata/data/tag && \ echo -n ${TAG} > pkg/machinery/gendata/data/tag && \
@ -359,8 +354,7 @@ RUN echo -n "undefined" > pkg/machinery/gendata/data/sha && \
RUN mkdir -p _out && \ RUN mkdir -p _out && \
echo PKGS=${PKGS} >> _out/talos-metadata && \ echo PKGS=${PKGS} >> _out/talos-metadata && \
echo TOOLS=${TOOLS} >> _out/talos-metadata && \ echo TOOLS=${TOOLS} >> _out/talos-metadata && \
echo TAG=${TAG} >> _out/talos-metadata && \ echo TAG=${TAG} >> _out/talos-metadata
echo EXTRAS=${EXTRAS} >> _out/talos-metadata
FROM scratch AS embed-abbrev FROM scratch AS embed-abbrev
COPY --from=embed-abbrev-generate /src/pkg/machinery/gendata/data /pkg/machinery/gendata/data COPY --from=embed-abbrev-generate /src/pkg/machinery/gendata/data /pkg/machinery/gendata/data
@ -1250,7 +1244,7 @@ COPY --from=proto-docs-build /tmp/api.md /website/content/v1.10/reference/
FROM scratch AS talosctl-cni-bundle FROM scratch AS talosctl-cni-bundle
ARG TARGETARCH ARG TARGETARCH
COPY --from=extras-talosctl-cni-bundle /opt/cni/bin/ /talosctl-cni-bundle-${TARGETARCH}/ COPY --from=pkgs-talosctl-cni-bundle /opt/cni/bin/ /talosctl-cni-bundle-${TARGETARCH}/
# The go-mod-outdated target lists all outdated modules. # The go-mod-outdated target lists all outdated modules.

6
Makefile
View File

@ -27,8 +27,7 @@ EMBED_TARGET ?= embed
TOOLS_PREFIX ?= ghcr.io/siderolabs/tools TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
TOOLS ?= v1.10.0-alpha.0-24-g4f2036e TOOLS ?= v1.10.0-alpha.0-24-g4f2036e
PKGS_PREFIX ?= ghcr.io/siderolabs PKGS_PREFIX ?= ghcr.io/siderolabs
PKGS ?= v1.10.0-alpha.0-77-ge331e59 PKGS ?= v1.10.0-alpha.0-80-g0486742
EXTRAS ?= v1.10.0-alpha.0-6-gca5b638
KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
@ -77,7 +76,7 @@ PKG_RUNC ?= $(PKGS_PREFIX)/runc:$(PKGS)
PKG_SD_BOOT ?= $(PKGS_PREFIX)/sd-boot:$(PKGS) PKG_SD_BOOT ?= $(PKGS_PREFIX)/sd-boot:$(PKGS)
PKG_SQUASHFS_TOOLS ?= $(PKGS_PREFIX)/squashfs-tools:$(PKGS) PKG_SQUASHFS_TOOLS ?= $(PKGS_PREFIX)/squashfs-tools:$(PKGS)
PKG_SYSTEMD_UDEVD ?= $(PKGS_PREFIX)/systemd-udevd:$(PKGS) PKG_SYSTEMD_UDEVD ?= $(PKGS_PREFIX)/systemd-udevd:$(PKGS)
PKG_TALOSCTL_CNI_BUNDLE ?= $(PKGS_PREFIX)/talosctl-cni-bundle:$(EXTRAS) PKG_TALOSCTL_CNI_BUNDLE ?= $(PKGS_PREFIX)/talosctl-cni-bundle:$(PKGS)
PKG_TAR ?= $(PKGS_PREFIX)/tar:$(PKGS) PKG_TAR ?= $(PKGS_PREFIX)/tar:$(PKGS)
PKG_UTIL_LINUX ?= $(PKGS_PREFIX)/util-linux:$(PKGS) PKG_UTIL_LINUX ?= $(PKGS_PREFIX)/util-linux:$(PKGS)
PKG_XFSPROGS ?= $(PKGS_PREFIX)/xfsprogs:$(PKGS) PKG_XFSPROGS ?= $(PKGS_PREFIX)/xfsprogs:$(PKGS)
@ -201,7 +200,6 @@ COMMON_ARGS += --build-arg=DEEPCOPY_GEN_VERSION=$(DEEPCOPY_GEN_VERSION)
COMMON_ARGS += --build-arg=DEEPCOPY_VERSION=$(DEEPCOPY_VERSION) COMMON_ARGS += --build-arg=DEEPCOPY_VERSION=$(DEEPCOPY_VERSION)
COMMON_ARGS += --build-arg=EMBED_TARGET=$(EMBED_TARGET) COMMON_ARGS += --build-arg=EMBED_TARGET=$(EMBED_TARGET)
COMMON_ARGS += --build-arg=ENUMER_VERSION=$(ENUMER_VERSION) COMMON_ARGS += --build-arg=ENUMER_VERSION=$(ENUMER_VERSION)
COMMON_ARGS += --build-arg=EXTRAS=$(EXTRAS)
COMMON_ARGS += --build-arg=GO_BUILDFLAGS_TALOSCTL="$(GO_BUILDFLAGS_TALOSCTL)" COMMON_ARGS += --build-arg=GO_BUILDFLAGS_TALOSCTL="$(GO_BUILDFLAGS_TALOSCTL)"
COMMON_ARGS += --build-arg=GO_BUILDFLAGS="$(GO_BUILDFLAGS)" COMMON_ARGS += --build-arg=GO_BUILDFLAGS="$(GO_BUILDFLAGS)"
COMMON_ARGS += --build-arg=GO_LDFLAGS="$(GO_LDFLAGS)" COMMON_ARGS += --build-arg=GO_LDFLAGS="$(GO_LDFLAGS)"

6
hack/release.toml
View File

@ -18,7 +18,7 @@ preface = """
[notes.updates] [notes.updates]
title = "Component Updates" title = "Component Updates"
description = """\ description = """\
* Linux: 6.12.21 * Linux: 6.12.23
* CNI plugins: 1.6.2 * CNI plugins: 1.6.2
* runc: 1.2.6 * runc: 1.2.6
* containerd: 2.0.4 * containerd: 2.0.4
@ -193,7 +193,3 @@ Talos now supports enabling SELinux enforcing mode, see [SELinux](https://www.ta
[make_deps.pkgs] [make_deps.pkgs]
variable = "PKGS" variable = "PKGS"
repository = "github.com/siderolabs/pkgs" repository = "github.com/siderolabs/pkgs"
[make_deps.extras]
variable = "EXTRAS"
repository = "github.com/siderolabs/extras"

2
pkg/machinery/constants/constants.go
View File

@ -14,7 +14,7 @@ import (
const ( const (
// DefaultKernelVersion is the default Linux kernel version. // DefaultKernelVersion is the default Linux kernel version.
DefaultKernelVersion = "6.12.21-talos" DefaultKernelVersion = "6.12.23-talos"
// KernelParamConfig is the kernel parameter name for specifying the URL. // KernelParamConfig is the kernel parameter name for specifying the URL.
// to the config. // to the config.

1
pkg/machinery/gendata/data/extras
View File

@ -1 +0,0 @@
v1.10.0-alpha.0-6-gca5b638

2
pkg/machinery/gendata/data/pkgs
View File

@ -1 +1 @@
v1.10.0-alpha.0-77-ge331e59 v1.10.0-alpha.0-80-g0486742

3
pkg/machinery/gendata/gendata.go
View File

@ -23,9 +23,6 @@ var (
// VersionPkgs declares variable used by version package. // VersionPkgs declares variable used by version package.
//go:embed data/pkgs //go:embed data/pkgs
VersionPkgs string VersionPkgs string
// VersionExtras declares variable used by version package.
//go:embed data/extras
VersionExtras string
// ImagesUsername declares variable used by images package. // ImagesUsername declares variable used by images package.
//go:embed data/username //go:embed data/username
ImagesUsername string ImagesUsername string

2
pkg/machinery/version/version.go
View File

@ -29,8 +29,6 @@ var (
Built string Built string
// PkgsVersion is set at build time. // PkgsVersion is set at build time.
PkgsVersion = gendata.VersionPkgs PkgsVersion = gendata.VersionPkgs
// ExtrasVersion is set at build time.
ExtrasVersion = gendata.VersionExtras
) )
const versionTemplate = ` Tag: {{ .Tag }} const versionTemplate = ` Tag: {{ .Tag }}

BIN
pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi
View File

Binary file not shown.