Skip to content

Commit 2ac8d22

Browse files
committed
chore: support unsupported flag for mkfs
Support `unsupported` flag for mkfs, so that `STATE` partition with size less than 300M can be created by `mkfs.xfs`. This allows to bring in newer `xfsprogs` that can repair corrupted FS better. Signed-off-by: Noel Georgi <git@frezbo.dev>
1 parent 9b9159d commit 2ac8d22

File tree

45 files changed

+108
-61
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+108
-61
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ ZSTD_COMPRESSION_LEVEL ?= 18
1717
CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 -- HEAD^2 | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q")
1818

1919
ARTIFACTS := _out
20-
TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0-6-g31ad71b
20+
TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0-8-ga764e8d
2121

2222
PKGS_PREFIX ?= ghcr.io/siderolabs
23-
PKGS ?= v1.8.0-alpha.0-43-g99650c8
24-
EXTRAS ?= v1.8.0-alpha.0-3-gcab51d8
23+
PKGS ?= v1.8.0-alpha.0-46-g124d35b
24+
EXTRAS ?= v1.8.0-alpha.0-5-g6f4a373
2525

2626
KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
2727
CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest

hack/release.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ preface = """\
1717
[notes.updates]
1818
title = "Component Updates"
1919
description = """\
20-
Kubernetes: 1.31.0-beta0
21-
Linux: 6.6.43
20+
Kubernetes: 1.31.0-rc.1
21+
Linux: 6.6.44
2222
containerd: 2.0.0-rc.3
2323
runc: 1.2.0-rc.2
2424
etcd: 3.5.15
2525
Flannel: 0.25.5
2626
Flannel CNI plugin: 1.5.1
2727
CoreDNS: 1.1.13
2828
29-
Talos is built with Go 1.22.5.
29+
Talos is built with Go 1.22.6.
3030
"""
3131

3232
[notes.apparmor]

hack/test/e2e-qemu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ function create_cluster {
194194
--cpus="${QEMU_CPUS:-2}" \
195195
--cpus-workers="${QEMU_CPUS_WORKERS:-2}" \
196196
--cidr=172.20.1.0/24 \
197-
--user-disk=/var/lib/extra:100MB \
198-
--user-disk=/var/lib/p1:100MB:/var/lib/p2:100MB \
197+
--user-disk=/var/lib/extra:350MB \
198+
--user-disk=/var/lib/p1:350MB:/var/lib/p2:350MB \
199199
--install-image="${INSTALLER_IMAGE}" \
200200
--with-init-node=false \
201201
--cni-bundle-url="${ARTIFACTS}/talosctl-cni-bundle-\${ARCH}.tar.gz" \

internal/pkg/partition/format.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ import (
1616

1717
// FormatOptions contains format parameters.
1818
type FormatOptions struct {
19-
Label string
20-
FileSystemType FileSystemType
21-
Force bool
19+
Label string
20+
FileSystemType FileSystemType
21+
Force bool
22+
UnsupportedFSOption bool
2223
}
2324

2425
// NewFormatOptions creates a new format options.
@@ -33,6 +34,11 @@ func Format(devname string, t *FormatOptions, printf func(string, ...any)) error
3334
}
3435

3536
opts := []makefs.Option{makefs.WithForce(t.Force), makefs.WithLabel(t.Label)}
37+
38+
if t.UnsupportedFSOption {
39+
opts = append(opts, makefs.WithUnsupportedFSOption(t.UnsupportedFSOption))
40+
}
41+
3642
printf("formatting the partition %q as %q with label %q\n", devname, t.FileSystemType, t.Label)
3743

3844
switch t.FileSystemType {
@@ -87,9 +93,10 @@ func systemPartitionsFormatOptions(label string) *FormatOptions {
8793
}
8894
case constants.StatePartitionLabel:
8995
return &FormatOptions{
90-
Label: constants.StatePartitionLabel,
91-
FileSystemType: FilesystemTypeXFS,
92-
Force: true,
96+
Label: constants.StatePartitionLabel,
97+
FileSystemType: FilesystemTypeXFS,
98+
Force: true,
99+
UnsupportedFSOption: true,
93100
}
94101
case constants.EphemeralPartitionLabel:
95102
return &FormatOptions{

pkg/machinery/api/cluster/cluster.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/machinery/api/cluster/cluster_grpc.pb.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/machinery/api/common/common.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/machinery/api/inspect/inspect.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/machinery/api/inspect/inspect_grpc.pb.go

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/machinery/api/machine/machine.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)