fix collecting list of namespaces, disable topic finalizers, fix tiered storage for rbac

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

Author: im-konge

systemtest/src/main/java/io/strimzi/systemtest/logs/TestLogCollector.java

@@ -276,18 +276,14 @@ public void collectLogs(String testClass, String testCase) {
     }
 
     private List<String> getListOfNamespaces(String testClass, String testCase) {
-        List<String> namespaces = new ArrayList<>();
-
-        namespaces.addAll(
-            KubeResourceManager.get().kubeClient().getClient()
-                .namespaces()
-                .withLabelSelector(getTestClassLabelSelector(testClass))
-                .list()
-                .getItems()
-                .stream()
-                .map(namespace -> namespace.getMetadata().getName())
-                .toList()
-        );
+        List<String> namespaces = new ArrayList<>(KubeResourceManager.get().kubeClient().getClient()
+            .namespaces()
+            .withLabelSelector(getTestClassLabelSelector(testClass))
+            .list()
+            .getItems()
+            .stream()
+            .map(namespace -> namespace.getMetadata().getName())
+            .toList());
 
         if (testCase != null) {
             namespaces.addAll(

systemtest/src/main/java/io/strimzi/systemtest/resources/NamespaceManager.java

@@ -24,6 +24,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 import static io.strimzi.test.k8s.KubeClusterResource.kubeClient;
@@ -335,14 +336,11 @@ public static void labelNamespace(String namespaceName, Map<String, String> labe
      */
     public List<String> getListOfNamespacesForTestClassAndTestCase(String testClass, String testCase) {
         List<String> namespaces = new ArrayList<>();
-        namespaces.addAll(getMapWithSuiteNamespaces().get(new CollectorElement(testClass)));
 
-        if (testCase != null) {
-            Set<String> namespacesForTestCase = getMapWithSuiteNamespaces().get(new CollectorElement(testClass, testCase));
+        Optional.ofNullable(getMapWithSuiteNamespaces().get(new CollectorElement(testClass))).ifPresent(namespaces::addAll);
 
-            if (namespacesForTestCase != null) {
-                namespaces.addAll(getMapWithSuiteNamespaces().get(new CollectorElement(testClass, testCase)));
-            }
+        if (testCase != null) {
+            Optional.ofNullable(getMapWithSuiteNamespaces().get(new CollectorElement(testClass, testCase))).ifPresent(namespaces::addAll);
         }
 
         return namespaces;

systemtest/src/main/java/io/strimzi/systemtest/templates/crd/KafkaTemplates.java

@@ -12,6 +12,7 @@
 import io.fabric8.kubernetes.api.model.ResourceRequirementsBuilder;
 import io.strimzi.api.kafka.model.common.metrics.JmxPrometheusExporterMetrics;
 import io.strimzi.api.kafka.model.common.metrics.JmxPrometheusExporterMetricsBuilder;
+import io.strimzi.api.kafka.model.common.template.ContainerEnvVarBuilder;
 import io.strimzi.api.kafka.model.kafka.KafkaBuilder;
 import io.strimzi.api.kafka.model.kafka.listener.GenericKafkaListenerBuilder;
 import io.strimzi.api.kafka.model.kafka.listener.KafkaListenerType;
@@ -215,6 +216,15 @@ private static void setDefaultLogging(KafkaBuilder kafkaBuilder) {
                             .addToLoggers("rootLogger.level", "DEBUG")
                         .endInlineLogging()
                     .endTopicOperator()
+                    .editOrNewTemplate()
+                        .editOrNewTopicOperatorContainer()
+                            .addToEnv(new ContainerEnvVarBuilder()
+                                .withName("STRIMZI_USE_FINALIZERS")
+                                .withValue("false")
+                                .build()
+                            )
+                        .endTopicOperatorContainer()
+                    .endTemplate()
                 .endEntityOperator()
             .endSpec();
     }

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

@@ -19,7 +19,6 @@
 import io.strimzi.systemtest.docs.TestDocsLabels;
 import io.strimzi.systemtest.kafkaclients.internalClients.KafkaClients;
 import io.strimzi.systemtest.kafkaclients.internalClients.admin.AdminClient;
-import io.strimzi.systemtest.resources.NamespaceManager;
 import io.strimzi.systemtest.resources.ResourceManager;
 import io.strimzi.systemtest.resources.crd.KafkaTopicResource;
 import io.strimzi.systemtest.resources.imageBuild.ImageBuild;
@@ -196,17 +195,17 @@ void setup() throws IOException {
         // we skip test case for kind + podman
         assumeFalse(cluster.isKind() && ContainerRuntimeUtils.getRuntime().equals(TestConstants.PODMAN));
 
+        // for RBAC, we are creating everything in co-namespace
+        // in order to not delete the Namespace (as in the install() method) we need to install CO first and then
+        // do everything else.
+        setupClusterOperator
+            .withDefaultConfiguration()
+            .install();
+
         suiteStorage = new TestStorage(ResourceManager.getTestContext());
 
-        NamespaceManager.getInstance().createNamespaceAndPrepare(suiteStorage.getNamespaceName());
-        cluster.setNamespace(suiteStorage.getNamespaceName());
-
         ImageBuild.buildImage(suiteStorage.getNamespaceName(), IMAGE_NAME, TIERED_STORAGE_DOCKERFILE, BUILT_IMAGE_TAG, Environment.KAFKA_TIERED_STORAGE_BASE_IMAGE);
         SetupMinio.deployMinio(suiteStorage.getNamespaceName());
         SetupMinio.createBucket(suiteStorage.getNamespaceName(), BUCKET_NAME);
-
-        setupClusterOperator
-            .withDefaultConfiguration()
-            .install();
     }
 }