Skip to content

Commit

Permalink
chore: re-enable DRBD extension
Browse files Browse the repository at this point in the history
See siderolabs/extensions#343

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
  • Loading branch information
smira committed Mar 15, 2024
1 parent 3ba180d commit 3130caf
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 23 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-11-gcb5fd56

PKGS_PREFIX ?= ghcr.io/siderolabs
PKGS ?= v1.7.0-alpha.0-35-g8804a60
PKGS ?= v1.7.0-alpha.0-37-g4a9a027
EXTRAS ?= v1.7.0-alpha.0-3-g47bb718

PKG_FHS ?= $(PKGS_PREFIX)/fhs:$(PKGS)
Expand Down
6 changes: 0 additions & 6 deletions hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ Talos is built with Go 1.22.1.
title = "Device Selectors"
description = """\
Talos Linux now supports `physical: true` qualifier for device selectors, it selects non-virtual network interfaces (i.e. `en0` is selected, while `bond0` is not).
"""

[notes.problems]
title = "Known Problems"
description = """\
DRBD extension is disabled in this release due to incompatibility with the latest Linux kernel.
"""

[notes.dns-resolve-cache]
Expand Down
30 changes: 15 additions & 15 deletions internal/integration/api/extensions_qemu.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,21 @@ func (suite *ExtensionsSuiteQEMU) TestExtensionsExpectedPaths() {
func (suite *ExtensionsSuiteQEMU) TestExtensionsExpectedModules() {
// expectedModulesModDep is a map of module name to module.dep name
expectedModulesModDep := map[string]string{
"asix": "asix.ko",
"ax88179_178a": "ax88179_178a.ko",
"ax88796b": "ax88796b.ko",
"binfmt_misc": "binfmt_misc.ko",
"btrfs": "btrfs.ko",
"cdc_ether": "cdc_ether.ko",
"cdc_mbim": "cdc_mbim.ko",
"cdc_ncm": "cdc_ncm.ko",
"cdc_subset": "cdc_subset.ko",
"cdc_wdm": "cdc-wdm.ko",
"cxgb": "cxgb.ko",
"cxgb3": "cxgb3.ko",
"cxgb4": "cxgb4.ko",
"cxgb4vf": "cxgb4vf.ko",
// "drbd": "drbd.ko", // disabled, see https://github.com/siderolabs/pkgs/pull/873
"asix": "asix.ko",
"ax88179_178a": "ax88179_178a.ko",
"ax88796b": "ax88796b.ko",
"binfmt_misc": "binfmt_misc.ko",
"btrfs": "btrfs.ko",
"cdc_ether": "cdc_ether.ko",
"cdc_mbim": "cdc_mbim.ko",
"cdc_ncm": "cdc_ncm.ko",
"cdc_subset": "cdc_subset.ko",
"cdc_wdm": "cdc-wdm.ko",
"cxgb": "cxgb.ko",
"cxgb3": "cxgb3.ko",
"cxgb4": "cxgb4.ko",
"cxgb4vf": "cxgb4vf.ko",
"drbd": "drbd.ko",
"gasket": "gasket.ko",
"net1080": "net1080.ko",
"option": "option.ko",
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-35-g8804a60
v1.7.0-alpha.0-37-g4a9a027

0 comments on commit 3130caf

Please sign in to comment.