From cbb3ba676c73009eb6cfe66fc776fc205bcbcce2 Mon Sep 17 00:00:00 2001
From: Kjeld Schouten <info@kjeldschouten.nl>
Date: Thu, 24 Oct 2024 11:21:34 +0200
Subject: [PATCH] feat(clustertool): move kernelModules to talconfig

---
 .../embed/generic/base/talos/talconfig.yaml   | 24 +++++++------------
 clustertool/embed/generic/patches/all.yaml    |  9 -------
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/clustertool/embed/generic/base/talos/talconfig.yaml b/clustertool/embed/generic/base/talos/talconfig.yaml
index 2857c92b482..9e1a914ee9a 100644
--- a/clustertool/embed/generic/base/talos/talconfig.yaml
+++ b/clustertool/embed/generic/base/talos/talconfig.yaml
@@ -41,6 +41,10 @@ nodes:
 controlPlane:
     patches:
         - '@./patches/controlplane.yaml'
+    kernelModules:
+     - name: nvme_tcp
+     - name: vfio_pci
+     - name: uio_pci_generic
     schematic:
         customization:
             extraKernelArgs:
@@ -50,17 +54,13 @@ controlPlane:
                     - siderolabs/util-linux-tools
                     - siderolabs/iscsi-tools
                     - siderolabs/qemu-guest-agent
-                    # Enable where needed
-                    # - siderolabs/amd-ucode
-                    # - siderolabs/bnx2-bnx2x
-                    # - siderolabs/drbd
-                    # - siderolabs/gasket-driver
-                    # - siderolabs/i915-ucode
-                    # - siderolabs/intel-ucode
-                    # - siderolabs/thunderbolt
 worker:
     patches:
         - '@./patches/worker.yaml'
+    kernelModules:
+     - name: nvme_tcp
+     - name: vfio_pci
+     - name: uio_pci_generic
     schematic:
         customization:
             systemExtensions:
@@ -68,11 +68,3 @@ worker:
                     - siderolabs/util-linux-tools
                     - siderolabs/iscsi-tools
                     - siderolabs/qemu-guest-agent
-                    # Enable where needed
-                    # - siderolabs/amd-ucode
-                    # - siderolabs/bnx2-bnx2x
-                    # - siderolabs/drbd
-                    # - siderolabs/gasket-driver
-                    # - siderolabs/i915-ucode
-                    # - siderolabs/intel-ucode
-                    # - siderolabs/thunderbolt
diff --git a/clustertool/embed/generic/patches/all.yaml b/clustertool/embed/generic/patches/all.yaml
index afbc8ecb4a9..6e098ffcfa8 100644
--- a/clustertool/embed/generic/patches/all.yaml
+++ b/clustertool/embed/generic/patches/all.yaml
@@ -4,15 +4,6 @@
     "disabled": false
     "servers":
       - "time.cloudflare.com"
-- op: add
-  path: /machine/kernel
-  value:
-    modules:
-     - "name": "dm_thin_pool"
-     - "name": "dm_mod"
-     - "name": nvme_tcp
-     - "name": vfio_pci
-     - "name": uio_pci_generic
 - op: replace
   path: /cluster/proxy
   value: