Merge branch 'siderolabs:main' into patch-1

Author: michaelkebe

Dockerfile

@@ -17,14 +17,14 @@ ZSTD_COMPRESSION_LEVEL ?= 18
 CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q")
 
 ARTIFACTS := _out
-TOOLS ?= ghcr.io/siderolabs/tools:v1.10.0-alpha.0-7-g7200845
+TOOLS ?= ghcr.io/siderolabs/tools:v1.10.0-alpha.0-10-g9db33dd
 
 DEBUG_TOOLS_SOURCE := scratch
 EMBED_TARGET ?= embed
 
 PKGS_PREFIX ?= ghcr.io/siderolabs
-PKGS ?= v1.10.0-alpha.0-34-g5763e3e
-EXTRAS ?= v1.10.0-alpha.0-2-gf4a110f
+PKGS ?= v1.10.0-alpha.0-36-g117a1d6
+EXTRAS ?= v1.10.0-alpha.0-3-g4102a78
 
 KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
 CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
@@ -64,7 +64,7 @@ PKG_KMOD ?= $(PKGS_PREFIX)/kmod:$(PKGS)
 PKG_CNI ?= $(PKGS_PREFIX)/cni:$(PKGS)
 PKG_FLANNEL_CNI ?= $(PKGS_PREFIX)/flannel-cni:$(PKGS)
 PKG_KERNEL ?= $(PKGS_PREFIX)/kernel:$(PKGS)
-PKG_TALOSCTL_CNI_BUNDLE_INSTALL ?= $(PKGS_PREFIX)/talosctl-cni-bundle-install:$(EXTRAS)
+PKG_TALOSCTL_CNI_BUNDLE ?= $(PKGS_PREFIX)/talosctl-cni-bundle:$(EXTRAS)
 
 # renovate: datasource=github-tags depName=golang/go
 GO_VERSION ?= 1.23
@@ -267,7 +267,7 @@ COMMON_ARGS += --build-arg=PKG_RASPBERYPI_FIRMWARE=$(PKG_RASPBERYPI_FIRMWARE)
 COMMON_ARGS += --build-arg=PKG_CNI=$(PKG_CNI)
 COMMON_ARGS += --build-arg=PKG_FLANNEL_CNI=$(PKG_FLANNEL_CNI)
 COMMON_ARGS += --build-arg=PKG_KERNEL=$(PKG_KERNEL)
-COMMON_ARGS += --build-arg=PKG_TALOSCTL_CNI_BUNDLE_INSTALL=$(PKG_TALOSCTL_CNI_BUNDLE_INSTALL)
+COMMON_ARGS += --build-arg=PKG_TALOSCTL_CNI_BUNDLE=$(PKG_TALOSCTL_CNI_BUNDLE)
 COMMON_ARGS += --build-arg=ABBREV_TAG=$(ABBREV_TAG)
 COMMON_ARGS += --build-arg=ZSTD_COMPRESSION_LEVEL=$(ZSTD_COMPRESSION_LEVEL)
 COMMON_ARGS += --build-arg=MICROSOFT_SECUREBOOT_RELEASE=$(MICROSOFT_SECUREBOOT_RELEASE)

Makefile

@@ -111,10 +111,29 @@ message LocatorSpec {
   google.api.expr.v1alpha1.CheckedExpr match = 1;
 }
 
+// MountRequestSpec is the spec for MountRequest.
+message MountRequestSpec {
+  string volume_id = 1;
+  string parent_mount_id = 2;
+  repeated string requesters = 3;
+  repeated string requester_i_ds = 4;
+  bool read_only = 5;
+}
+
 // MountSpec is the spec for volume mount.
 message MountSpec {
   string target_path = 1;
   string selinux_label = 2;
+  repeated string options = 3;
+}
+
+// MountStatusSpec is the spec for MountStatus.
+message MountStatusSpec {
+  MountRequestSpec spec = 1;
+  string target = 2;
+  string source = 3;
+  talos.resource.definitions.enums.BlockFilesystemType filesystem = 4;
+  bool read_only = 5;
 }
 
 // PartitionSpec is the spec for volume partitioning.
@@ -160,6 +179,21 @@ message VolumeConfigSpec {
   EncryptionSpec encryption = 6;
 }
 
+// VolumeMountRequestSpec is the spec for VolumeMountRequest.
+message VolumeMountRequestSpec {
+  string volume_id = 1;
+  string requester = 2;
+  bool read_only = 3;
+}
+
+// VolumeMountStatusSpec is the spec for VolumeMountStatus.
+message VolumeMountStatusSpec {
+  string volume_id = 1;
+  string requester = 2;
+  string target = 3;
+  bool read_only = 4;
+}
+
 // VolumeStatusSpec is the spec for VolumeStatus resource.
 message VolumeStatusSpec {
   talos.resource.definitions.enums.BlockVolumePhase phase = 1;
@@ -176,5 +210,6 @@ message VolumeStatusSpec {
   talos.resource.definitions.enums.BlockEncryptionProviderType encryption_provider = 12;
   string pretty_size = 13;
   repeated string encryption_failed_syncs = 14;
+  MountSpec mount_spec = 15;
 }
 

api/resource/definitions/block/block.proto

@@ -102,6 +102,32 @@ message DNSResolveCacheSpec {
   string status = 1;
 }
 
+// EthernetChannelsSpec describes config of Ethernet channels.
+message EthernetChannelsSpec {
+  uint32 rx = 1;
+  uint32 tx = 2;
+  uint32 other = 3;
+  uint32 combined = 4;
+}
+
+// EthernetChannelsStatus describes status of Ethernet channels.
+message EthernetChannelsStatus {
+  uint32 rx_max = 1;
+  uint32 tx_max = 2;
+  uint32 other_max = 3;
+  uint32 combined_max = 4;
+  uint32 rx = 5;
+  uint32 tx = 6;
+  uint32 other = 7;
+  uint32 combined = 8;
+}
+
+// EthernetFeatureStatus describes status of Ethernet features.
+message EthernetFeatureStatus {
+  string name = 1;
+  string status = 2;
+}
+
 // EthernetRingsSpec describes config of Ethernet rings.
 message EthernetRingsSpec {
   uint32 rx = 1;
@@ -138,6 +164,8 @@ message EthernetRingsStatus {
 // EthernetSpecSpec describes config of Ethernet link.
 message EthernetSpecSpec {
   EthernetRingsSpec rings = 1;
+  map<string, bool> features = 2;
+  EthernetChannelsSpec channels = 3;
 }
 
 // EthernetStatusSpec describes status of rendered secrets.
@@ -149,6 +177,8 @@ message EthernetStatusSpec {
   repeated string our_modes = 5;
   repeated string peer_modes = 6;
   EthernetRingsStatus rings = 7;
+  repeated EthernetFeatureStatus features = 8;
+  EthernetChannelsStatus channels = 9;
 }
 
 // HardwareAddrSpec describes spec for the link.

api/resource/definitions/network/network.proto

@@ -1295,7 +1295,7 @@ func init() {
 	createCmd.Flags().BoolVar(&clusterDiskPreallocate, clusterDiskPreallocateFlag, true, "whether disk space should be preallocated")
 	createCmd.Flags().StringSliceVar(&clusterDisks, clusterDisksFlag, []string{}, "list of disks to create for each VM in format: <mount_point1>:<size1>:<mount_point2>:<size2>")
 	createCmd.Flags().IntVar(&extraDisks, "extra-disks", 0, "number of extra disks to create for each worker VM")
-	createCmd.Flags().StringSliceVar(&extraDisksDrivers, "extra-disks-drivers", nil, "driver for each extra disk (virtio, ide, ahci, scsi, nvme)")
+	createCmd.Flags().StringSliceVar(&extraDisksDrivers, "extra-disks-drivers", nil, "driver for each extra disk (virtio, ide, ahci, scsi, nvme, megaraid)")
 	createCmd.Flags().IntVar(&extraDiskSize, "extra-disks-size", 5*1024, "default limit on disk size in MB (each VM)")
 	createCmd.Flags().StringVar(&targetArch, "arch", stdruntime.GOARCH, "cluster architecture")
 	createCmd.Flags().BoolVar(&clusterWait, "wait", true, "wait for the cluster to be ready before returning")

cmd/talosctl/cmd/mgmt/cluster/create.go

@@ -1,6 +1,6 @@
 module github.com/siderolabs/talos
 
-go 1.23.5
+go 1.23.6
 
 replace (
 	// see e.g. https://github.com/grpc/grpc-go/issues/6696
@@ -10,7 +10,7 @@ replace (
 	github.com/coredns/coredns => github.com/siderolabs/coredns v1.12.50
 
 	// forked ethtool introduces missing APIs
-	github.com/mdlayher/ethtool => github.com/siderolabs/ethtool v0.0.0-20250204161245-ee04fc1b1856
+	github.com/mdlayher/ethtool => github.com/siderolabs/ethtool v0.3.0
 
 	// see https://github.com/mdlayher/kobject/pull/5
 	github.com/mdlayher/kobject => github.com/smira/kobject v0.0.0-20240304111826-49c8d4613389
@@ -145,7 +145,7 @@ require (
 	github.com/siderolabs/gen v0.8.0
 	github.com/siderolabs/go-api-signature v0.3.6
 	github.com/siderolabs/go-blockdevice v0.4.8
-	github.com/siderolabs/go-blockdevice/v2 v2.0.13
+	github.com/siderolabs/go-blockdevice/v2 v2.0.14
 	github.com/siderolabs/go-circular v0.2.1
 	github.com/siderolabs/go-cmd v0.1.3
 	github.com/siderolabs/go-copy v0.1.0

go.mod

@@ -639,16 +639,16 @@ github.com/siderolabs/discovery-api v0.1.5 h1:fcHVkLkWla7C5+9IeOGEUQ4N8Yp9R7a/kc
 github.com/siderolabs/discovery-api v0.1.5/go.mod h1:b9jOm9T2puYVcRqCAjWxPcHz2qBqDX8I0OZDOyOFHXg=
 github.com/siderolabs/discovery-client v0.1.10 h1:bTAvFLiISSzVXyYL1cIgAz8cPYd9ZfvhxwdebgtxARA=
 github.com/siderolabs/discovery-client v0.1.10/go.mod h1:Ew1z07eyJwqNwum84IKYH4S649KEKK5WUmRW49HlXS8=
-github.com/siderolabs/ethtool v0.0.0-20250204161245-ee04fc1b1856 h1:LQe9knKlZXGdrm0J/bcojk42qqhfBoPpiqqgXQa/7pY=
-github.com/siderolabs/ethtool v0.0.0-20250204161245-ee04fc1b1856/go.mod h1:3u47fCDlOQGM7IhXhUB3uPEcjdQxGmK53/45kEg1HDM=
+github.com/siderolabs/ethtool v0.3.0 h1:98kMFGnkDEikngqtDyk6R/ykMjaGpJ1df/bw9vPLKJg=
+github.com/siderolabs/ethtool v0.3.0/go.mod h1:3u47fCDlOQGM7IhXhUB3uPEcjdQxGmK53/45kEg1HDM=
 github.com/siderolabs/gen v0.8.0 h1:Pj93+hexkk5hQ7izjJ6YXnEWc8vlzOmDwFz13/VzS7o=
 github.com/siderolabs/gen v0.8.0/go.mod h1:an3a2Y53O7kUjnnK8Bfu3gewtvnIOu5RTU6HalFtXQQ=
 github.com/siderolabs/go-api-signature v0.3.6 h1:wDIsXbpl7Oa/FXvxB6uz4VL9INA9fmr3EbmjEZYFJrU=
 github.com/siderolabs/go-api-signature v0.3.6/go.mod h1:hoH13AfunHflxbXfh+NoploqV13ZTDfQ1mQJWNVSW9U=
 github.com/siderolabs/go-blockdevice v0.4.8 h1:KfdWvIx0Jft5YVuCsFIJFwjWEF1oqtzkgX9PeU9cX4c=
 github.com/siderolabs/go-blockdevice v0.4.8/go.mod h1:4PeOuk71pReJj1JQEXDE7kIIQJPVe8a+HZQa+qjxSEA=
-github.com/siderolabs/go-blockdevice/v2 v2.0.13 h1:N94eK+EFwnD+2kdNT38910Qlu+5+Z0WDODKbX7NXvPs=
-github.com/siderolabs/go-blockdevice/v2 v2.0.13/go.mod h1:74htzCV913UzaLZ4H+NBXkwWlYnBJIq5m/379ZEcu8w=
+github.com/siderolabs/go-blockdevice/v2 v2.0.14 h1:9Nu4ceeKpCSUhSub6RbxU2eat5IwAOR11Vdb5mPVASo=
+github.com/siderolabs/go-blockdevice/v2 v2.0.14/go.mod h1:74htzCV913UzaLZ4H+NBXkwWlYnBJIq5m/379ZEcu8w=
 github.com/siderolabs/go-circular v0.2.1 h1:a++iVCn9jyhICX3POQZZX8n72p2h5JGdGU6w1ulmpcA=
 github.com/siderolabs/go-circular v0.2.1/go.mod h1:ZDItzVyXK+B/XuqTBV5MtQtSv06VI+oCmWGRnNCATo8=
 github.com/siderolabs/go-cmd v0.1.3 h1:JrgZwqhJQeoec3QRON0LK+fv+0y7d0DyY7zsfkO6ciw=

go.sum

@@ -1,4 +1,4 @@
-go 1.23.5
+go 1.23.6
 
 use (
 	.

go.work

@@ -1,7 +1,4 @@
-#!/toolchain/bin/bash
-
-export PATH=/toolchain/bin
-
+#!/bin/bash
 PREFIX="${1}"
 
 function remove_symlinks() {
@@ -25,16 +22,17 @@ find ${PREFIX} -type f -name \*.la -delete
 find ${PREFIX} -type f \( -name \*.static -o -name \*.o \) -delete
 # Strip debug symbols from all libraries and binaries.
 find ${PREFIX}/{lib,usr/lib} -type f \( -name \*.so* -a ! -name \*dbg \) -exec strip --strip-unneeded {} ';' || true
-find ${PREFIX}/{bin,sbin,usr/bin,usr/sbin} -type f -exec strip --strip-all {} ';' || true
+find ${PREFIX}/usr/bin -type f -exec strip --strip-all {} ';' || true
 
 # Remove header files, man files, and any other non-runtime dependencies.
-rm -rf ${PREFIX}/{lib,usr/lib}/pkgconfig/ \
+rm -rf ${PREFIX}/usr/lib/pkgconfig/ \
        ${PREFIX}/{include,usr/include}/* \
        ${PREFIX}/{share,usr/share}/* \
        ${PREFIX}/usr/lib/cmake \
-       ${PREFIX}/lib/gconv/ \
+       ${PREFIX}/usr/lib/gconv/ \
        ${PREFIX}/usr/libexec/getconf \
        ${PREFIX}/var/db
 
 # Remove contents of /usr/bin except for udevadm
-find ${PREFIX}/usr/bin \( -type f -o -type l \) ! -name udevadm -delete
+# TODO: do not install these files in the first place.
+# find ${PREFIX}/usr/bin \( -type f -o -type l \) ! -name udevadm -delete

hack/cleanup.sh

@@ -1,6 +1,6 @@
 module github.com/siderolabs/cloud-image-uploader
 
-go 1.23.5
+go 1.23.6
 
 require (
 	cloud.google.com/go/storage v1.49.0