diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 02cf6fe20a2..a224752e11a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-09-20T00:40:37Z by kres 8be5fa7. +# Generated on 2024-09-20T17:49:19Z by kres 8be5fa7. name: default concurrency: @@ -1464,7 +1464,7 @@ jobs: QEMU_EXTRA_DISKS: "3" QEMU_MEMORY_WORKERS: "4096" SHORT_INTEGRATION_TEST: "yes" - WITH_CONFIG_PATCH_WORKER: '@_out/installer-extensions-patch.yaml:@hack/test/patches/extensions.yaml' + WITH_CONFIG_PATCH_WORKER: '@_out/installer-extensions-patch.yaml:@hack/test/patches/extensions.yaml:@hack/test/patches/dm-raid-module.yaml' run: | sudo -E make e2e-qemu - name: save artifacts @@ -2774,7 +2774,7 @@ jobs: QEMU_EXTRA_DISKS: "3" QEMU_EXTRA_DISKS_DRIVERS: ide,nvme QEMU_EXTRA_DISKS_SIZE: "10240" - WITH_CONFIG_PATCH_WORKER: '@hack/test/patches/ephemeral-nvme.yaml' + WITH_CONFIG_PATCH_WORKER: '@hack/test/patches/ephemeral-nvme.yaml:@hack/test/patches/dm-raid-module.yaml' run: | sudo -E make e2e-qemu - name: save artifacts @@ -3086,10 +3086,10 @@ jobs: - name: e2e-qemu env: IMAGE_REGISTRY: registry.dev.siderolabs.io - QEMU_EXTRA_DISKS: "2" + QEMU_EXTRA_DISKS: "3" QEMU_EXTRA_DISKS_DRIVERS: ide,nvme QEMU_EXTRA_DISKS_SIZE: "10240" - WITH_CONFIG_PATCH_WORKER: '@hack/test/patches/ephemeral-nvme.yaml' + WITH_CONFIG_PATCH_WORKER: '@hack/test/patches/ephemeral-nvme.yaml:@hack/test/patches/dm-raid-module.yaml' WITH_DISK_ENCRYPTION: "true" WITH_KUBESPAN: "true" WITH_VIRTUAL_IP: "true" diff --git a/.github/workflows/integration-extensions-cron.yaml b/.github/workflows/integration-extensions-cron.yaml index 530f4a277a1..ba684b009c6 100644 --- a/.github/workflows/integration-extensions-cron.yaml +++ b/.github/workflows/integration-extensions-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-09-20T00:40:37Z by kres 8be5fa7. +# Generated on 2024-09-20T17:49:19Z by kres 8be5fa7. name: integration-extensions-cron concurrency: @@ -113,7 +113,7 @@ jobs: QEMU_EXTRA_DISKS: "3" QEMU_MEMORY_WORKERS: "4096" SHORT_INTEGRATION_TEST: "yes" - WITH_CONFIG_PATCH_WORKER: '@_out/installer-extensions-patch.yaml:@hack/test/patches/extensions.yaml' + WITH_CONFIG_PATCH_WORKER: '@_out/installer-extensions-patch.yaml:@hack/test/patches/extensions.yaml:@hack/test/patches/dm-raid-module.yaml' run: | sudo -E make e2e-qemu - name: save artifacts diff --git a/.github/workflows/integration-qemu-cron.yaml b/.github/workflows/integration-qemu-cron.yaml index e5506a0bcb8..7d2cbcfeae1 100644 --- a/.github/workflows/integration-qemu-cron.yaml +++ b/.github/workflows/integration-qemu-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-09-18T10:36:36Z by kres 8be5fa7. +# Generated on 2024-09-20T16:31:33Z by kres 8be5fa7. name: integration-qemu-cron concurrency: @@ -84,7 +84,7 @@ jobs: QEMU_EXTRA_DISKS: "3" QEMU_EXTRA_DISKS_DRIVERS: ide,nvme QEMU_EXTRA_DISKS_SIZE: "10240" - WITH_CONFIG_PATCH_WORKER: '@hack/test/patches/ephemeral-nvme.yaml' + WITH_CONFIG_PATCH_WORKER: '@hack/test/patches/ephemeral-nvme.yaml:@hack/test/patches/dm-raid-module.yaml' run: | sudo -E make e2e-qemu - name: save artifacts diff --git a/.github/workflows/integration-qemu-encrypted-vip-cron.yaml b/.github/workflows/integration-qemu-encrypted-vip-cron.yaml index ac1e08ed498..347c1df217f 100644 --- a/.github/workflows/integration-qemu-encrypted-vip-cron.yaml +++ b/.github/workflows/integration-qemu-encrypted-vip-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2024-09-09T13:58:35Z by kres 8be5fa7. +# Generated on 2024-09-20T17:49:19Z by kres 8be5fa7. name: integration-qemu-encrypted-vip-cron concurrency: @@ -81,10 +81,10 @@ jobs: - name: e2e-qemu env: IMAGE_REGISTRY: registry.dev.siderolabs.io - QEMU_EXTRA_DISKS: "2" + QEMU_EXTRA_DISKS: "3" QEMU_EXTRA_DISKS_DRIVERS: ide,nvme QEMU_EXTRA_DISKS_SIZE: "10240" - WITH_CONFIG_PATCH_WORKER: '@hack/test/patches/ephemeral-nvme.yaml' + WITH_CONFIG_PATCH_WORKER: '@hack/test/patches/ephemeral-nvme.yaml:@hack/test/patches/dm-raid-module.yaml' WITH_DISK_ENCRYPTION: "true" WITH_KUBESPAN: "true" WITH_VIRTUAL_IP: "true" diff --git a/.kres.yaml b/.kres.yaml index d70aabda377..e91c478b060 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -332,7 +332,7 @@ spec: QEMU_EXTRA_DISKS: "3" QEMU_EXTRA_DISKS_SIZE: "10240" QEMU_EXTRA_DISKS_DRIVERS: "ide,nvme" - WITH_CONFIG_PATCH_WORKER: "@hack/test/patches/ephemeral-nvme.yaml" + WITH_CONFIG_PATCH_WORKER: "@hack/test/patches/ephemeral-nvme.yaml:@hack/test/patches/dm-raid-module.yaml" - name: save-talos-logs conditions: - always @@ -1017,7 +1017,7 @@ spec: withSudo: true environment: QEMU_MEMORY_WORKERS: 4096 - WITH_CONFIG_PATCH_WORKER: "@_out/installer-extensions-patch.yaml:@hack/test/patches/extensions.yaml" + WITH_CONFIG_PATCH_WORKER: "@_out/installer-extensions-patch.yaml:@hack/test/patches/extensions.yaml:@hack/test/patches/dm-raid-module.yaml" QEMU_EXTRA_DISKS: 3 SHORT_INTEGRATION_TEST: yes EXTRA_TEST_ARGS: -talos.extensions.qemu @@ -1153,10 +1153,10 @@ spec: WITH_VIRTUAL_IP: true WITH_KUBESPAN: true IMAGE_REGISTRY: registry.dev.siderolabs.io - QEMU_EXTRA_DISKS: "2" + QEMU_EXTRA_DISKS: "3" QEMU_EXTRA_DISKS_SIZE: "10240" QEMU_EXTRA_DISKS_DRIVERS: "ide,nvme" - WITH_CONFIG_PATCH_WORKER: "@hack/test/patches/ephemeral-nvme.yaml" + WITH_CONFIG_PATCH_WORKER: "@hack/test/patches/ephemeral-nvme.yaml:@hack/test/patches/dm-raid-module.yaml" - name: save-talos-logs conditions: - always diff --git a/hack/test/patches/dm-raid-module.yaml b/hack/test/patches/dm-raid-module.yaml new file mode 100644 index 00000000000..1e6984317ff --- /dev/null +++ b/hack/test/patches/dm-raid-module.yaml @@ -0,0 +1,4 @@ +machine: + kernel: + modules: + - name: dm_raid diff --git a/internal/integration/api/volumes.go b/internal/integration/api/volumes.go index 3055839216a..d04e08a3183 100644 --- a/internal/integration/api/volumes.go +++ b/internal/integration/api/volumes.go @@ -211,7 +211,7 @@ func (suite *VolumesSuite) TestLVMActivation() { stdout, _, err = podDef.Exec( suite.ctx, - "nsenter --mount=/proc/1/ns/mnt -- lvcreate -n lv0 -L 1G vg0", + "nsenter --mount=/proc/1/ns/mnt -- lvcreate --mirrors=1 --type=raid1 --nosync -n lv0 -L 1G vg0", ) suite.Require().NoError(err) @@ -275,7 +275,8 @@ func (suite *VolumesSuite) lvmVolumeExists() bool { } // we test with creating a volume group with two logical volumes - return lvmVolumeCount == 2 + // one mirrored and one not, so we expect to see 6 volumes + return lvmVolumeCount == 6 } func init() {