diff --git a/Makefile b/Makefile index 245043ca10..eca11d8ff3 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ ARTIFACTS := _out TOOLS ?= ghcr.io/siderolabs/tools:v1.7.0-alpha.0-6-gb6b4d9e PKGS_PREFIX ?= ghcr.io/siderolabs -PKGS ?= v1.7.0-alpha.0-29-g1904994 +PKGS ?= v1.7.0-alpha.0-31-gcb39126 EXTRAS ?= v1.7.0-alpha.0-1-gc4934e1 PKG_FHS ?= $(PKGS_PREFIX)/fhs:$(PKGS) diff --git a/hack/release.toml b/hack/release.toml index 5535e963ee..8617cfb7fb 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -17,7 +17,7 @@ preface = """\ [notes.updates] title = "Component Updates" description = """\ -Linux: 6.6.16 +Linux: 6.6.18 etcd: 3.5.11 Kubernetes: 1.30.0-alpha.3 containerd: 1.7.13 @@ -36,7 +36,7 @@ Talos Linux now supports `physical: true` qualifier for device selectors, it sel [notes.problems] title = "Known Problems" description = """\ -ZFS and DRBD extensions are disabled in this release due to incompatibility with the latest Linux kernel. +DRBD extension is disabled in this release due to incompatibility with the latest Linux kernel. """ [notes.dns-resolve-cache] diff --git a/internal/integration/api/extensions_qemu.go b/internal/integration/api/extensions_qemu.go index 05ad7f5f5b..314a0e250f 100644 --- a/internal/integration/api/extensions_qemu.go +++ b/internal/integration/api/extensions_qemu.go @@ -126,7 +126,7 @@ func (suite *ExtensionsSuiteQEMU) TestExtensionsExpectedModules() { "usb_wwan": "usb_wwan.ko", "usbnet": "usbnet.ko", "zaurus": "zaurus.ko", - // "zfs": "zfs.ko", // disabled, see https://github.com/siderolabs/pkgs/pull/873 + "zfs": "zfs.ko", } node := suite.RandomDiscoveredNodeInternalIP(machine.TypeWorker) @@ -554,8 +554,6 @@ func (suite *ExtensionsSuiteQEMU) mdADMScan() string { // TestExtensionsZFS verifies zfs is working, udev rules work and the pool is mounted on reboot. func (suite *ExtensionsSuiteQEMU) TestExtensionsZFS() { - suite.T().Skip("skipping due to https://github.com/siderolabs/pkgs/pull/873") - node := suite.RandomDiscoveredNodeInternalIP(machine.TypeWorker) suite.AssertServicesRunning(suite.ctx, node, map[string]string{"ext-zpool-importer": "Finished"}) diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index 4108a63f80..79b4c1b10f 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -16,7 +16,7 @@ import ( const ( // DefaultKernelVersion is the default Linux kernel version. - DefaultKernelVersion = "6.6.16-talos" + DefaultKernelVersion = "6.6.18-talos" // KernelModulesPath is the default path to the kernel modules without the kernel version. KernelModulesPath = "/lib/modules" diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index ddfd9684cf..3bcbfe3adf 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.7.0-alpha.0-29-g1904994 \ No newline at end of file +v1.7.0-alpha.0-31-gcb39126 \ No newline at end of file diff --git a/pkg/provision/providers/vm/internal/ipxe/data/ipxe/amd64/snp.efi b/pkg/provision/providers/vm/internal/ipxe/data/ipxe/amd64/snp.efi index fbd61b901c..380d8a3251 100644 Binary files a/pkg/provision/providers/vm/internal/ipxe/data/ipxe/amd64/snp.efi and b/pkg/provision/providers/vm/internal/ipxe/data/ipxe/amd64/snp.efi differ diff --git a/pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi b/pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi index 833fb6f2a9..9952e5c201 100644 Binary files a/pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi and b/pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi differ