fix the MultipleNamespaceST and AllNamespaceST

Signed-off-by: Lukas Kral <[email protected]>

Author: im-konge

systemtest/src/test/java/io/strimzi/systemtest/watcher/AllNamespaceST.java

@@ -4,6 +4,8 @@
  */
 package io.strimzi.systemtest.watcher;
 
+import io.fabric8.kubernetes.api.model.NamespaceBuilder;
+import io.skodjob.testframe.resources.KubeResourceManager;
 import io.strimzi.systemtest.Environment;
 import io.strimzi.systemtest.TestConstants;
 import io.strimzi.systemtest.logs.CollectorElement;
@@ -27,8 +29,18 @@ class AllNamespaceST extends AbstractNamespaceST {
     private void deployTestSpecificClusterOperator() {
         LOGGER.info("Creating Cluster Operator which will watch over all Namespaces");
 
-        NamespaceManager.getInstance().createNamespaces(setupClusterOperator.getOperatorNamespace(),
-            CollectorElement.createCollectorElement(this.getClass().getName()), Arrays.asList(PRIMARY_KAFKA_WATCHED_NAMESPACE, MAIN_TEST_NAMESPACE));
+        KubeResourceManager.get().createResourceWithWait(
+            new NamespaceBuilder()
+                .withNewMetadata()
+                    .withName(PRIMARY_KAFKA_WATCHED_NAMESPACE)
+                .endMetadata()
+                .build(),
+            new NamespaceBuilder()
+                .withNewMetadata()
+                    .withName(MAIN_TEST_NAMESPACE)
+                .endMetadata()
+                .build()
+        );
 
         setupClusterOperator
             .withCustomConfiguration(new ClusterOperatorConfigurationBuilder()

systemtest/src/test/java/io/strimzi/systemtest/watcher/MultipleNamespaceST.java

@@ -4,16 +4,14 @@
  */
 package io.strimzi.systemtest.watcher;
 
-import io.strimzi.systemtest.logs.CollectorElement;
-import io.strimzi.systemtest.resources.NamespaceManager;
+import io.fabric8.kubernetes.api.model.NamespaceBuilder;
+import io.skodjob.testframe.resources.KubeResourceManager;
 import io.strimzi.systemtest.resources.operator.ClusterOperatorConfigurationBuilder;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Tag;
 
-import java.util.Arrays;
-
 import static io.strimzi.systemtest.TestConstants.CO_NAMESPACE;
 import static io.strimzi.systemtest.TestTags.REGRESSION;
 
@@ -25,8 +23,18 @@ class MultipleNamespaceST extends AbstractNamespaceST {
     private void deployTestSpecificClusterOperator() {
         LOGGER.info("Creating Cluster Operator which will watch over multiple Namespaces");
 
-        NamespaceManager.getInstance().createNamespaces(setupClusterOperator.getOperatorNamespace(),
-            CollectorElement.createCollectorElement(this.getClass().getName()), Arrays.asList(PRIMARY_KAFKA_WATCHED_NAMESPACE, MAIN_TEST_NAMESPACE));
+        KubeResourceManager.get().createResourceWithWait(
+            new NamespaceBuilder()
+                .withNewMetadata()
+                    .withName(PRIMARY_KAFKA_WATCHED_NAMESPACE)
+                .endMetadata()
+                .build(),
+            new NamespaceBuilder()
+                .withNewMetadata()
+                    .withName(MAIN_TEST_NAMESPACE)
+                .endMetadata()
+                .build()
+        );
 
         setupClusterOperator
             .withCustomConfiguration(new ClusterOperatorConfigurationBuilder()