feat: update Linux to 6.12.23

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

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>

Dockerfile

@@ -4,7 +4,6 @@
 
 ARG TOOLS=scratch
 ARG PKGS=scratch
-ARG EXTRAS=scratch
 ARG INSTALLER_ARCH=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/portmap /opt/cni/bin/portmap
 
-# Resolve package images using ${EXTRAS} to be used later in COPY --from=.
-
-FROM ${PKG_TALOSCTL_CNI_BUNDLE} AS extras-talosctl-cni-bundle
+FROM ${PKG_TALOSCTL_CNI_BUNDLE} AS pkgs-talosctl-cni-bundle
 
 # The tools target provides base toolchain for the build.
 
@@ -337,13 +334,11 @@ ARG TAG
 ARG ARTIFACTS
 ARG PKGS
 ARG TOOLS
-ARG EXTRAS
 RUN mkdir -p pkg/machinery/gendata/data && \
     echo -n ${NAME} > pkg/machinery/gendata/data/name && \
     echo -n ${SHA} > pkg/machinery/gendata/data/sha && \
     echo -n ${USERNAME} > pkg/machinery/gendata/data/username && \
     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 ${TOOLS} > pkg/machinery/gendata/data/tools && \
     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 && \
     echo PKGS=${PKGS} >> _out/talos-metadata && \
     echo TOOLS=${TOOLS} >> _out/talos-metadata && \
-    echo TAG=${TAG} >> _out/talos-metadata && \
-    echo EXTRAS=${EXTRAS} >> _out/talos-metadata
+    echo TAG=${TAG} >> _out/talos-metadata
 
 FROM scratch AS embed-abbrev
 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
 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.
 

Makefile

@@ -27,8 +27,7 @@ EMBED_TARGET ?= embed
 TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
 TOOLS ?= v1.10.0-alpha.0-24-g4f2036e
 PKGS_PREFIX ?= ghcr.io/siderolabs
-PKGS ?= v1.10.0-alpha.0-77-ge331e59
-EXTRAS ?= v1.10.0-alpha.0-6-gca5b638
+PKGS ?= v1.10.0-alpha.0-80-g0486742
 
 KRES_IMAGE ?= ghcr.io/siderolabs/kres: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_SQUASHFS_TOOLS ?= $(PKGS_PREFIX)/squashfs-tools:$(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_UTIL_LINUX ?= $(PKGS_PREFIX)/util-linux:$(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=EMBED_TARGET=$(EMBED_TARGET)
 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="$(GO_BUILDFLAGS)"
 COMMON_ARGS += --build-arg=GO_LDFLAGS="$(GO_LDFLAGS)"

hack/release.toml

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

pkg/machinery/constants/constants.go

@@ -14,7 +14,7 @@ import (
 
 const (
 	// 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.
 	// to the config.

pkg/machinery/gendata/data/extras

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

pkg/machinery/gendata/data/pkgs

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

pkg/machinery/gendata/gendata.go

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

pkg/machinery/version/version.go

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