From faa2fb684bac640a71f7f57dda79bc16db842663 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Fri, 12 Jun 2026 08:49:19 -0700 Subject: [PATCH] ci: remove unused EnableCsiOperator test setting The CSI operator is installed unconditionally by the integration test installer, so the EnableCsiOperator setting no longer selects between CSI management modes and is consumed nowhere in the test framework. Remove the setting and the three suites' usages of it. Signed-off-by: Joshua Hoblitt --- tests/framework/installer/ceph_settings.go | 1 - tests/integration/ceph_helm_test.go | 1 - tests/integration/ceph_smoke_test.go | 1 - tests/integration/ceph_upgrade_test.go | 1 - 4 files changed, 4 deletions(-) diff --git a/tests/framework/installer/ceph_settings.go b/tests/framework/installer/ceph_settings.go index 5383f557b..e49a75e46 100644 --- a/tests/framework/installer/ceph_settings.go +++ b/tests/framework/installer/ceph_settings.go @@ -52,7 +52,6 @@ type TestCephSettings struct { RookVersion string CephVersion cephv1.CephVersionSpec KubernetesVersion string - EnableCsiOperator bool ClusterConcurrency int } diff --git a/tests/integration/ceph_helm_test.go b/tests/integration/ceph_helm_test.go index 360368fec..8727d062b 100644 --- a/tests/integration/ceph_helm_test.go +++ b/tests/integration/ceph_helm_test.go @@ -71,7 +71,6 @@ func (h *HelmSuite) SetupSuite() { ConnectionsEncrypted: true, RookVersion: installer.LocalBuildTag, CephVersion: installer.SquidVersion, - EnableCsiOperator: true, } h.settings.ApplyEnvVars() h.installer, h.k8shelper = StartTestCluster(h.T, h.settings) diff --git a/tests/integration/ceph_smoke_test.go b/tests/integration/ceph_smoke_test.go index 130466166..5f4f351bf 100644 --- a/tests/integration/ceph_smoke_test.go +++ b/tests/integration/ceph_smoke_test.go @@ -94,7 +94,6 @@ func (s *SmokeSuite) SetupSuite() { ChangeHostName: true, RookVersion: installer.LocalBuildTag, CephVersion: installer.ReturnCephVersion(), - EnableCsiOperator: true, } s.settings.ApplyEnvVars() s.installer, s.k8sh = StartTestCluster(s.T, s.settings) diff --git a/tests/integration/ceph_upgrade_test.go b/tests/integration/ceph_upgrade_test.go index 0ea167847..af6ed8d91 100644 --- a/tests/integration/ceph_upgrade_test.go +++ b/tests/integration/ceph_upgrade_test.go @@ -90,7 +90,6 @@ func (s *UpgradeSuite) baseSetup(useHelm bool, initialRookVersion string, initia SkipClusterCleanup: true, RookVersion: initialRookVersion, CephVersion: initialCephVersion, - EnableCsiOperator: true, } s.installer, s.k8sh = StartTestCluster(s.T, s.settings)