From f91cefd323aebee3072e05da4ae8fb298928ec2c Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Tue, 16 Dec 2025 14:54:09 +0400 Subject: [PATCH] test: bump memory for OpenEBS test Ensure correct deployment. Signed-off-by: Andrey Smirnov --- .github/workflows/ci.yaml | 4 ++-- .../integration-qemu-csi-openebs-cron.yaml | 4 ++-- .kres.yaml | 2 +- internal/integration/k8s/constants.go | 2 +- internal/integration/k8s/openebs.go | 13 ++++++++++++- .../integration/k8s/testdata/openebs-diskpool.yaml | 2 +- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9c2ab61a2..816496b34 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 2025-12-15T14:45:49Z by kres 4b09af7. +# Generated on 2025-12-16T10:54:07Z by kres 4b09af7. concurrency: group: ${{ github.head_ref || github.run_id }} @@ -4143,7 +4143,7 @@ jobs: QEMU_CPUS_WORKERS: "4" QEMU_EXTRA_DISKS: "1" QEMU_EXTRA_DISKS_SIZE: "12288" - QEMU_MEMORY_WORKERS: "4096" + QEMU_MEMORY_WORKERS: "8192" QEMU_WORKERS: "3" SHORT_INTEGRATION_TEST: "yes" WITH_CONFIG_PATCH_CONTROLPLANE: '@hack/test/patches/openebs-cp.yaml' diff --git a/.github/workflows/integration-qemu-csi-openebs-cron.yaml b/.github/workflows/integration-qemu-csi-openebs-cron.yaml index 1da11a97b..c20b49d25 100644 --- a/.github/workflows/integration-qemu-csi-openebs-cron.yaml +++ b/.github/workflows/integration-qemu-csi-openebs-cron.yaml @@ -1,6 +1,6 @@ # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT. # -# Generated on 2025-12-15T14:23:39Z by kres 4b09af7. +# Generated on 2025-12-16T10:54:07Z by kres 4b09af7. concurrency: group: ${{ github.head_ref || github.run_id }} @@ -85,7 +85,7 @@ jobs: QEMU_CPUS_WORKERS: "4" QEMU_EXTRA_DISKS: "1" QEMU_EXTRA_DISKS_SIZE: "12288" - QEMU_MEMORY_WORKERS: "4096" + QEMU_MEMORY_WORKERS: "8192" QEMU_WORKERS: "3" SHORT_INTEGRATION_TEST: "yes" WITH_CONFIG_PATCH_CONTROLPLANE: '@hack/test/patches/openebs-cp.yaml' diff --git a/.kres.yaml b/.kres.yaml index 62c3ca045..e9abb6678 100644 --- a/.kres.yaml +++ b/.kres.yaml @@ -2200,7 +2200,7 @@ spec: SHORT_INTEGRATION_TEST: yes QEMU_WORKERS: 3 QEMU_CPUS_WORKERS: 4 - QEMU_MEMORY_WORKERS: 4096 + QEMU_MEMORY_WORKERS: 8192 QEMU_EXTRA_DISKS: 1 QEMU_EXTRA_DISKS_SIZE: 12288 WITH_CONFIG_PATCH_CONTROLPLANE: "@hack/test/patches/openebs-cp.yaml" diff --git a/internal/integration/k8s/constants.go b/internal/integration/k8s/constants.go index 16c61a513..24b24c7c6 100644 --- a/internal/integration/k8s/constants.go +++ b/internal/integration/k8s/constants.go @@ -16,5 +16,5 @@ const ( LongHornHelmChartVersion = "v1.9.0" // OpenEBSChartVersion is the version of the OpenEBS Helm chart to use. // renovate: datasource=helm versioning=helm depName=openebs registryUrl=https://openebs.github.io/openebs - OpenEBSChartVersion = "v4.2.0" + OpenEBSChartVersion = "v4.3.3" ) diff --git a/internal/integration/k8s/openebs.go b/internal/integration/k8s/openebs.go index dffabf659..60f0e4a4f 100644 --- a/internal/integration/k8s/openebs.go +++ b/internal/integration/k8s/openebs.go @@ -10,13 +10,17 @@ import ( "bytes" "context" _ "embed" + "path/filepath" "text/template" "time" + "github.com/cosi-project/runtime/pkg/safe" "github.com/siderolabs/gen/xslices" "github.com/siderolabs/talos/internal/integration/base" + "github.com/siderolabs/talos/pkg/machinery/client" "github.com/siderolabs/talos/pkg/machinery/config/machine" + "github.com/siderolabs/talos/pkg/machinery/resources/block" ) //go:embed testdata/openebs-values.yaml @@ -81,6 +85,13 @@ func (suite *OpenEBSSuite) TestDeploy() { k8sNode, err := suite.GetK8sNodeByInternalIP(ctx, node) suite.Require().NoError(err) + diskResource, err := safe.ReaderGetByID[*block.Disk](client.WithNode(ctx, node), suite.Client.COSI, filepath.Base(disk)) + suite.Require().NoError(err) + + suite.Require().Greater(len(diskResource.TypedSpec().Symlinks), 1, "disk symlinks should not be empty") + + diskSymlink := diskResource.TypedSpec().Symlinks[1] + tmpl, err := template.New(node).Parse(openEBSDiskPoolTemplate) suite.Require().NoError(err) @@ -91,7 +102,7 @@ func (suite *OpenEBSSuite) TestDeploy() { Disk string }{ Node: k8sNode.Name, - Disk: disk, + Disk: diskSymlink, })) diskPoolUnstructured := suite.ParseManifests(result.Bytes()) diff --git a/internal/integration/k8s/testdata/openebs-diskpool.yaml b/internal/integration/k8s/testdata/openebs-diskpool.yaml index 2015592a5..38f5ed02a 100644 --- a/internal/integration/k8s/testdata/openebs-diskpool.yaml +++ b/internal/integration/k8s/testdata/openebs-diskpool.yaml @@ -1,4 +1,4 @@ -apiVersion: "openebs.io/v1beta2" +apiVersion: "openebs.io/v1beta3" kind: DiskPool metadata: name: pool-{{ .Node }}