Skip to content

Commit e7cf889

Browse files
im-kongeim-konge
committed
use singleton instead of instance in AbstractST
Signed-off-by: Lukas Kral <[email protected]>
1 parent df23eb3 commit e7cf889

File tree

68 files changed

+273
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+273
-136
lines changed

‎systemtest/src/main/java/io/strimzi/systemtest/resources/ResourceManager.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -508,14 +508,6 @@ public void deleteResourcesOfTypeWithoutWait(final String resourceKind) {
508508
return waitForResourceStatus(operation, resource, status, resourceTimeout);
509509
}
510510

511-
public static String getCoDeploymentName() {
512-
return coDeploymentName;
513-
}
514-
515-
public static void setCoDeploymentName(String newName) {
516-
coDeploymentName = newName;
517-
}
518-
519511
public static void waitForResourceReadiness(String namespaceName, String resourceType, String resourceName) {
520512
LOGGER.info("Waiting for " + resourceType + "/" + resourceName + " readiness");
521513

‎systemtest/src/main/java/io/strimzi/systemtest/resources/operator/SetupClusterOperator.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,26 @@
1313

1414
public class SetupClusterOperator {
1515

16+
private static SetupClusterOperator instance;
1617
private ClusterOperatorConfiguration clusterOperatorConfiguration = new ClusterOperatorConfiguration();
1718

1819
private HelmInstallation helmInstallation;
1920
private OlmInstallation olmInstallation;
2021
private YamlInstallation yamlInstallation;
2122

23+
// Private constructor to prevent external instantiation
24+
private SetupClusterOperator() {
25+
this.clusterOperatorConfiguration = new ClusterOperatorConfiguration();
26+
}
27+
28+
// Public method to get the singleton instance
29+
public static synchronized SetupClusterOperator get() {
30+
if (instance == null) {
31+
instance = new SetupClusterOperator();
32+
}
33+
return instance;
34+
}
35+
2236
public SetupClusterOperator withDefaultConfiguration() {
2337
this.clusterOperatorConfiguration = new ClusterOperatorConfiguration();
2438
return this;

‎systemtest/src/main/java/io/strimzi/systemtest/utils/VerificationUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import io.strimzi.operator.common.model.Labels;
1919
import io.strimzi.systemtest.Environment;
2020
import io.strimzi.systemtest.TestConstants;
21-
import io.strimzi.systemtest.resources.ResourceManager;
2221
import io.strimzi.systemtest.resources.crd.KafkaMirrorMaker2Resource;
2322
import io.strimzi.systemtest.resources.crd.KafkaResource;
2423
import io.strimzi.systemtest.resources.crd.StrimziPodSetResource;
24+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
2525
import io.strimzi.systemtest.utils.kubeUtils.objects.PodUtils;
2626
import org.apache.logging.log4j.LogManager;
2727
import org.apache.logging.log4j.Logger;
@@ -428,7 +428,7 @@ public static void verifyClusterOperatorMM2DockerImage(String clusterOperatorNam
428428
*/
429429
public static Map<String, String> getClusterOperatorDeploymentImages(String clusterOperatorNamespace) {
430430
Map<String, String> images = new HashMap<>();
431-
for (Container container : kubeClient().getDeployment(clusterOperatorNamespace, ResourceManager.getCoDeploymentName()).getSpec().getTemplate().getSpec().getContainers()) {
431+
for (Container container : kubeClient().getDeployment(clusterOperatorNamespace, SetupClusterOperator.get().getOperatorDeploymentName()).getSpec().getTemplate().getSpec().getContainers()) {
432432
for (EnvVar envVar : container.getEnv()) {
433433
images.put(envVar.getName(), envVar.getValue());
434434
}

‎systemtest/src/test/java/io/strimzi/systemtest/AbstractST.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ public abstract class AbstractST implements TestSeparator {
106106

107107
// Test-Frame integration stuff, remove everything else when not needed
108108
protected final KubeResourceManager kubeResourceManager = KubeResourceManager.get();
109-
protected final SetupClusterOperator setupClusterOperator = new SetupClusterOperator();
110109

111110
protected final ResourceManager resourceManager = ResourceManager.getInstance();
112111
protected final TestSuiteNamespaceManager testSuiteNamespaceManager = TestSuiteNamespaceManager.getInstance();
@@ -119,7 +118,7 @@ public abstract class AbstractST implements TestSeparator {
119118

120119
protected void assertNoCoErrorsLogged(String namespaceName, long sinceSeconds) {
121120
LOGGER.info("Search in strimzi-cluster-operator log for errors in last {} second(s)", sinceSeconds);
122-
String clusterOperatorLog = cmdKubeClient(namespaceName).searchInLog(TestConstants.DEPLOYMENT, ResourceManager.getCoDeploymentName(), sinceSeconds, "Exception", "Error", "Throwable", "OOM");
121+
String clusterOperatorLog = cmdKubeClient(namespaceName).searchInLog(TestConstants.DEPLOYMENT, SetupClusterOperator.get().getOperatorDeploymentName(), sinceSeconds, "Exception", "Error", "Throwable", "OOM");
123122
assertThat(clusterOperatorLog, logHasNoUnexpectedErrors());
124123
}
125124

@@ -229,7 +228,7 @@ void tearDownTestCase(ExtensionContext extensionContext) throws Exception {
229228
try {
230229
// This method needs to be disabled for the moment, as it brings flakiness and is unstable due to regexes and current matcher checks.
231230
// Needs to be reworked on what errors to ignore. Better error logging should be added.
232-
// assertNoCoErrorsLogged(setupClusterOperator.getOperatorNamespace(), (long) extensionContext.getStore(ExtensionContext.Namespace.GLOBAL).get(TestConstants.TEST_EXECUTION_START_TIME_KEY));
231+
// assertNoCoErrorsLogged(SetupClusterOperator.get().getOperatorNamespace(), (long) extensionContext.getStore(ExtensionContext.Namespace.GLOBAL).get(TestConstants.TEST_EXECUTION_START_TIME_KEY));
233232
} finally {
234233
afterEachMayOverride();
235234
afterEachMustExecute();

‎systemtest/src/test/java/io/strimzi/systemtest/bridge/HttpBridgeCorsST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.strimzi.systemtest.resources.ResourceManager;
2020
import io.strimzi.systemtest.resources.crd.KafkaBridgeResource;
2121
import io.strimzi.systemtest.resources.kubernetes.NetworkPolicyResource;
22+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
2223
import io.strimzi.systemtest.storage.TestStorage;
2324
import io.strimzi.systemtest.templates.crd.KafkaBridgeTemplates;
2425
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
@@ -168,7 +169,8 @@ void testCorsForbidden() {
168169
void beforeAll() {
169170
suiteTestStorage = new TestStorage(ResourceManager.getTestContext());
170171

171-
setupClusterOperator
172+
SetupClusterOperator
173+
.get()
172174
.withDefaultConfiguration()
173175
.install();
174176

‎systemtest/src/test/java/io/strimzi/systemtest/bridge/HttpBridgeST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import io.strimzi.systemtest.resources.ResourceManager;
3030
import io.strimzi.systemtest.resources.crd.KafkaBridgeResource;
3131
import io.strimzi.systemtest.resources.operator.ClusterOperatorConfigurationBuilder;
32+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
3233
import io.strimzi.systemtest.storage.TestStorage;
3334
import io.strimzi.systemtest.templates.crd.KafkaBridgeTemplates;
3435
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
@@ -490,7 +491,8 @@ void testCustomBridgeLabelsAreProperlySet() {
490491
void createClassResources() {
491492
suiteTestStorage = new TestStorage(ResourceManager.getTestContext());
492493

493-
setupClusterOperator
494+
SetupClusterOperator
495+
.get()
494496
.withCustomConfiguration(new ClusterOperatorConfigurationBuilder()
495497
.withExtraEnvVars(
496498
new EnvVarBuilder()

‎systemtest/src/test/java/io/strimzi/systemtest/bridge/HttpBridgeScramShaST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import io.strimzi.systemtest.kafkaclients.internalClients.BridgeClientsBuilder;
2626
import io.strimzi.systemtest.kafkaclients.internalClients.KafkaClients;
2727
import io.strimzi.systemtest.resources.ResourceManager;
28+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
2829
import io.strimzi.systemtest.storage.TestStorage;
2930
import io.strimzi.systemtest.templates.crd.KafkaBridgeTemplates;
3031
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
@@ -141,7 +142,8 @@ void testReceiveSimpleMessageTlsScramSha() {
141142
void setUp() {
142143
suiteTestStorage = new TestStorage(ResourceManager.getTestContext());
143144

144-
setupClusterOperator
145+
SetupClusterOperator
146+
.get()
145147
.withDefaultConfiguration()
146148
.install();
147149

‎systemtest/src/test/java/io/strimzi/systemtest/bridge/HttpBridgeTlsST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import io.strimzi.systemtest.kafkaclients.internalClients.BridgeClientsBuilder;
3232
import io.strimzi.systemtest.kafkaclients.internalClients.KafkaClients;
3333
import io.strimzi.systemtest.resources.ResourceManager;
34+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
3435
import io.strimzi.systemtest.storage.TestStorage;
3536
import io.strimzi.systemtest.templates.crd.KafkaBridgeTemplates;
3637
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
@@ -276,7 +277,8 @@ private void testWeirdUsername(String weirdUserName, KafkaListenerAuthentication
276277
void setUp() {
277278
suiteTestStorage = new TestStorage(ResourceManager.getTestContext());
278279

279-
setupClusterOperator
280+
SetupClusterOperator
281+
.get()
280282
.withDefaultConfiguration()
281283
.install();
282284

‎systemtest/src/test/java/io/strimzi/systemtest/connect/ConnectBuilderST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import io.strimzi.systemtest.resources.crd.KafkaConnectorResource;
4242
import io.strimzi.systemtest.resources.kubernetes.NetworkPolicyResource;
4343
import io.strimzi.systemtest.resources.operator.ClusterOperatorConfigurationBuilder;
44+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
4445
import io.strimzi.systemtest.storage.TestStorage;
4546
import io.strimzi.systemtest.templates.crd.KafkaConnectTemplates;
4647
import io.strimzi.systemtest.templates.crd.KafkaConnectorTemplates;
@@ -605,7 +606,8 @@ private String getImageNameForTestCase() {
605606
void setup() {
606607
suiteTestStorage = new TestStorage(ResourceManager.getTestContext());
607608

608-
setupClusterOperator
609+
SetupClusterOperator
610+
.get()
609611
.withCustomConfiguration(new ClusterOperatorConfigurationBuilder()
610612
.withOperationTimeout(TestConstants.CO_OPERATION_TIMEOUT_SHORT)
611613
.build()

‎systemtest/src/test/java/io/strimzi/systemtest/connect/ConnectST.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import io.strimzi.systemtest.resources.crd.KafkaUserResource;
6262
import io.strimzi.systemtest.resources.kubernetes.NetworkPolicyResource;
6363
import io.strimzi.systemtest.resources.operator.ClusterOperatorConfigurationBuilder;
64+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
6465
import io.strimzi.systemtest.storage.TestStorage;
6566
import io.strimzi.systemtest.templates.crd.KafkaConnectTemplates;
6667
import io.strimzi.systemtest.templates.crd.KafkaConnectorTemplates;
@@ -179,7 +180,7 @@ void testDeployRollUndeploy() {
179180
Map<String, Object> config = StUtils.loadProperties(connectConfigurations);
180181
assertThat(config.entrySet().containsAll(exceptedConfig.entrySet()), is(true));
181182

182-
VerificationUtils.verifyClusterOperatorConnectDockerImage(setupClusterOperator.getOperatorNamespace(), testStorage.getNamespaceName(), testStorage.getClusterName());
183+
VerificationUtils.verifyClusterOperatorConnectDockerImage(SetupClusterOperator.get().getOperatorNamespace(), testStorage.getNamespaceName(), testStorage.getClusterName());
183184

184185
VerificationUtils.verifyPodsLabels(testStorage.getNamespaceName(), KafkaConnectResources.componentName(testStorage.getClusterName()), testStorage.getKafkaConnectSelector());
185186
VerificationUtils.verifyServiceLabels(testStorage.getNamespaceName(), KafkaConnectResources.serviceName(testStorage.getClusterName()), testStorage.getKafkaConnectSelector());
@@ -1893,7 +1894,8 @@ void verifySinkConnectorByBlockAndUnblock(TestStorage testStorage, String kafkaC
18931894

18941895
@BeforeAll
18951896
void setUp() {
1896-
setupClusterOperator
1897+
SetupClusterOperator
1898+
.get()
18971899
.withCustomConfiguration(new ClusterOperatorConfigurationBuilder()
18981900
.withOperationTimeout(TestConstants.CO_OPERATION_TIMEOUT_MEDIUM)
18991901
.build()

‎systemtest/src/test/java/io/strimzi/systemtest/cruisecontrol/CruiseControlApiST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.strimzi.systemtest.annotations.ParallelNamespaceTest;
1616
import io.strimzi.systemtest.docs.TestDocsLabels;
1717
import io.strimzi.systemtest.resources.ResourceManager;
18+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
1819
import io.strimzi.systemtest.storage.TestStorage;
1920
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
2021
import io.strimzi.systemtest.templates.crd.KafkaTemplates;
@@ -159,7 +160,8 @@ void setUp() {
159160
// This should be re-enabled once Cruise Control support is fixed: https://github.com/strimzi/strimzi-kafka-operator/issues/11199
160161
Assumptions.assumeTrue(TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "4.0.0") < 0);
161162

162-
setupClusterOperator
163+
SetupClusterOperator
164+
.get()
163165
.withDefaultConfiguration()
164166
.install();
165167
}

‎systemtest/src/test/java/io/strimzi/systemtest/cruisecontrol/CruiseControlConfigurationST.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.strimzi.systemtest.kafkaclients.internalClients.admin.AdminClient;
2424
import io.strimzi.systemtest.resources.ResourceManager;
2525
import io.strimzi.systemtest.resources.crd.KafkaResource;
26+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
2627
import io.strimzi.systemtest.storage.TestStorage;
2728
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
2829
import io.strimzi.systemtest.templates.crd.KafkaTemplates;
@@ -217,8 +218,9 @@ void setUp() {
217218
// Cruise Control currently does not work with Kafka 4.0 and this tests is therefore disabled when Kafka 4.0 or newer is used.
218219
// This should be re-enabled once Cruise Control support is fixed: https://github.com/strimzi/strimzi-kafka-operator/issues/11199
219220
Assumptions.assumeTrue(TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "4.0.0") < 0);
220-
221-
setupClusterOperator
221+
222+
SetupClusterOperator
223+
.get()
222224
.withDefaultConfiguration()
223225
.install();
224226
}

‎systemtest/src/test/java/io/strimzi/systemtest/cruisecontrol/CruiseControlST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import io.strimzi.systemtest.resources.crd.KafkaNodePoolResource;
4242
import io.strimzi.systemtest.resources.crd.KafkaRebalanceResource;
4343
import io.strimzi.systemtest.resources.crd.KafkaResource;
44+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
4445
import io.strimzi.systemtest.storage.TestStorage;
4546
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
4647
import io.strimzi.systemtest.templates.crd.KafkaRebalanceTemplates;
@@ -873,7 +874,8 @@ void setUp() {
873874
// This should be re-enabled once Cruise Control support is fixed: https://github.com/strimzi/strimzi-kafka-operator/issues/11199
874875
Assumptions.assumeTrue(TestKafkaVersion.compareDottedVersions(Environment.ST_KAFKA_VERSION, "4.0.0") < 0);
875876

876-
setupClusterOperator
877+
SetupClusterOperator
878+
.get()
877879
.withDefaultConfiguration()
878880
.install();
879881
}

‎systemtest/src/test/java/io/strimzi/systemtest/kafka/ConfigProviderST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import io.strimzi.systemtest.docs.TestDocsLabels;
2525
import io.strimzi.systemtest.kafkaclients.internalClients.KafkaClients;
2626
import io.strimzi.systemtest.resources.ResourceManager;
27+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
2728
import io.strimzi.systemtest.storage.TestStorage;
2829
import io.strimzi.systemtest.templates.crd.KafkaConnectTemplates;
2930
import io.strimzi.systemtest.templates.crd.KafkaConnectorTemplates;
@@ -194,7 +195,8 @@ void testConnectWithConnectorUsingConfigAndEnvProvider() {
194195

195196
@BeforeAll
196197
void setup() {
197-
setupClusterOperator
198+
SetupClusterOperator
199+
.get()
198200
.withDefaultConfiguration()
199201
.install();
200202
}

‎systemtest/src/test/java/io/strimzi/systemtest/kafka/KafkaNodePoolST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.strimzi.systemtest.resources.ResourceManager;
2222
import io.strimzi.systemtest.resources.crd.KafkaNodePoolResource;
2323
import io.strimzi.systemtest.resources.crd.KafkaResource;
24+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
2425
import io.strimzi.systemtest.storage.TestStorage;
2526
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
2627
import io.strimzi.systemtest.templates.crd.KafkaTemplates;
@@ -324,7 +325,8 @@ private void transmitMessagesWithNewTopicAndClean(TestStorage testStorage, int t
324325

325326
@BeforeAll
326327
void setup() {
327-
setupClusterOperator
328+
SetupClusterOperator
329+
.get()
328330
.withDefaultConfiguration()
329331
.install();
330332
}

‎systemtest/src/test/java/io/strimzi/systemtest/kafka/KafkaST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
import io.strimzi.systemtest.resources.crd.KafkaNodePoolResource;
6161
import io.strimzi.systemtest.resources.crd.KafkaResource;
6262
import io.strimzi.systemtest.resources.crd.StrimziPodSetResource;
63+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
6364
import io.strimzi.systemtest.storage.TestStorage;
6465
import io.strimzi.systemtest.templates.crd.KafkaBridgeTemplates;
6566
import io.strimzi.systemtest.templates.crd.KafkaConnectTemplates;
@@ -1398,7 +1399,8 @@ protected void afterEachMayOverride() {
13981399

13991400
@BeforeAll
14001401
void setup() {
1401-
setupClusterOperator
1402+
SetupClusterOperator
1403+
.get()
14021404
.withDefaultConfiguration()
14031405
.install();
14041406
}

‎systemtest/src/test/java/io/strimzi/systemtest/kafka/KafkaVersionsST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.strimzi.systemtest.docs.TestDocsLabels;
1919
import io.strimzi.systemtest.kafkaclients.internalClients.KafkaClients;
2020
import io.strimzi.systemtest.resources.ResourceManager;
21+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
2122
import io.strimzi.systemtest.storage.TestStorage;
2223
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
2324
import io.strimzi.systemtest.templates.crd.KafkaTemplates;
@@ -198,7 +199,8 @@ void testKafkaWithVersion(final TestKafkaVersion testKafkaVersion) {
198199

199200
@BeforeAll
200201
void setup() {
201-
setupClusterOperator
202+
SetupClusterOperator
203+
.get()
202204
.withDefaultConfiguration()
203205
.install();
204206
}

‎systemtest/src/test/java/io/strimzi/systemtest/kafka/QuotasST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import io.strimzi.systemtest.docs.TestDocsLabels;
2020
import io.strimzi.systemtest.kafkaclients.internalClients.KafkaClients;
2121
import io.strimzi.systemtest.resources.ResourceManager;
22+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
2223
import io.strimzi.systemtest.storage.TestStorage;
2324
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
2425
import io.strimzi.systemtest.templates.crd.KafkaTemplates;
@@ -238,7 +239,8 @@ void afterEach() {
238239

239240
@BeforeAll
240241
void setup() {
241-
setupClusterOperator
242+
SetupClusterOperator
243+
.get()
242244
.withDefaultConfiguration()
243245
.install();
244246
}

‎systemtest/src/test/java/io/strimzi/systemtest/kafka/TieredStorageST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.strimzi.systemtest.resources.crd.KafkaTopicResource;
2424
import io.strimzi.systemtest.resources.imageBuild.ImageBuild;
2525
import io.strimzi.systemtest.resources.minio.SetupMinio;
26+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
2627
import io.strimzi.systemtest.storage.TestStorage;
2728
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
2829
import io.strimzi.systemtest.templates.crd.KafkaTemplates;
@@ -198,7 +199,8 @@ void setup() throws IOException {
198199
// for RBAC, we are creating everything in co-namespace
199200
// in order to not delete the Namespace (as in the install() method) we need to install CO first and then
200201
// do everything else.
201-
setupClusterOperator
202+
SetupClusterOperator
203+
.get()
202204
.withDefaultConfiguration()
203205
.install();
204206

‎systemtest/src/test/java/io/strimzi/systemtest/kafka/dynamicconfiguration/DynamicConfST.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import io.strimzi.systemtest.resources.ResourceManager;
2525
import io.strimzi.systemtest.resources.crd.KafkaResource;
2626
import io.strimzi.systemtest.resources.crd.StrimziPodSetResource;
27+
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
2728
import io.strimzi.systemtest.storage.TestStorage;
2829
import io.strimzi.systemtest.templates.crd.KafkaNodePoolTemplates;
2930
import io.strimzi.systemtest.templates.crd.KafkaTemplates;
@@ -469,7 +470,8 @@ void setupEach() {
469470

470471
@BeforeAll
471472
void setup() {
472-
setupClusterOperator
473+
SetupClusterOperator
474+
.get()
473475
.withDefaultConfiguration()
474476
.install();
475477
}

0 commit comments

Comments
 (0)