Skip to content

Commit

Permalink
feat: update Linux to 6.6.18
Browse files Browse the repository at this point in the history
ZFS extension got re-enabled for 1.7.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
  • Loading branch information
smira committed Feb 29, 2024
1 parent 8125e75 commit bbed07e
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]
Expand Down
4 changes: 1 addition & 3 deletions internal/integration/api/extensions_qemu.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"})

Expand Down
2 changes: 1 addition & 1 deletion pkg/machinery/constants/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/machinery/gendata/data/pkgs
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.7.0-alpha.0-29-g1904994
v1.7.0-alpha.0-31-gcb39126
Binary file modified pkg/provision/providers/vm/internal/ipxe/data/ipxe/amd64/snp.efi
Binary file not shown.
Binary file modified pkg/provision/providers/vm/internal/ipxe/data/ipxe/arm64/snp.efi
Binary file not shown.

0 comments on commit bbed07e

Please sign in to comment.