another fixes

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

Author: im-konge

systemtest/src/main/java/io/strimzi/systemtest/utils/kafkaUtils/KafkaTopicUtils.java

@@ -333,7 +333,7 @@ public static void setFinalizersInAllTopicsToNull(String namespaceName) {
     public static void waitForTopicStatusMessage(String namespaceName, String topicName, String message) {
         LOGGER.info("Waiting for KafkaTopic: {}/{} to contain message: {} in its status", namespaceName, topicName, message);
 
-        TestUtils.waitFor(String.join("KafkaTopic: %s/%s status to contain message: %s", namespaceName, topicName, message), TestConstants.GLOBAL_POLL_INTERVAL, TestConstants.GLOBAL_TIMEOUT,
+        TestUtils.waitFor(String.format("KafkaTopic: %s/%s status to contain message: %s", namespaceName, topicName, message), TestConstants.GLOBAL_POLL_INTERVAL, TestConstants.GLOBAL_TIMEOUT,
                 () -> KafkaTopicResource.kafkaTopicClient().inNamespace(namespaceName).withName(topicName).get()
                         .getStatus().getConditions().stream().anyMatch(condition -> condition.getMessage().contains(message))
         );

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

@@ -4,6 +4,7 @@
  */
 package io.strimzi.systemtest;
 
+import io.fabric8.kubernetes.api.model.Namespace;
 import io.skodjob.testframe.resources.ClusterRoleBindingType;
 import io.skodjob.testframe.resources.ClusterRoleType;
 import io.skodjob.testframe.resources.CustomResourceDefinitionType;
@@ -82,15 +83,19 @@ public abstract class AbstractST implements TestSeparator {
         );
 
         KubeResourceManager.get().addCreateCallback(resource -> {
-            Map<String, String> labels = new HashMap<>();
-            labels.put(TestConstants.TEST_SUITE_NAME_LABEL, StUtils.removePackageName(KubeResourceManager.get().getTestContext().getRequiredTestClass().getName()));
+            if (resource instanceof Namespace namespace) {
+                Map<String, String> labels = new HashMap<>(namespace.getMetadata().getLabels());
+                labels.put(TestConstants.TEST_SUITE_NAME_LABEL, StUtils.removePackageName(KubeResourceManager.get().getTestContext().getRequiredTestClass().getName()));
 
-            if (KubeResourceManager.get().getTestContext().getTestMethod().isPresent()) {
-                String testCaseName = KubeResourceManager.get().getTestContext().getRequiredTestMethod().getName();
-                labels.put(TestConstants.TEST_CASE_NAME_LABEL, testCaseName);
-            }
+                if (KubeResourceManager.get().getTestContext().getTestMethod().isPresent()) {
+                    String testCaseName = KubeResourceManager.get().getTestContext().getRequiredTestMethod().getName();
+                    labels.put(TestConstants.TEST_CASE_NAME_LABEL, testCaseName);
+                }
+
+                namespace.getMetadata().setLabels(labels);
 
-            resource.getMetadata().setLabels(labels);
+                KubeResourceManager.get().kubeClient().getClient().resource(namespace).update();
+            }
         });
     }
 

systemtest/src/test/java/io/strimzi/systemtest/operators/topic/TopicST.java

@@ -177,6 +177,11 @@ void testDeleteTopicEnableFalse() {
                 .editOrNewEntityOperator()
                     .withNewTopicOperator()
                     .endTopicOperator()
+                    // create new container so all the changes will be wiped
+                    .editOrNewTemplate()
+                        .withNewTopicOperatorContainer()
+                        .endTopicOperatorContainer()
+                    .endTemplate()
                 .endEntityOperator()
             .endSpec()
             .build());

systemtest/src/test/java/io/strimzi/systemtest/operators/user/UserST.java

@@ -348,7 +348,7 @@ void testTlsExternalUser() {
             .endSpec()
             .build());
 
-        resourceManager.createResourceWithWait(KafkaTopicTemplates.topic(testStorage.getClusterName(), testStorage.getTopicName(), testStorage.getNamespaceName()).build());
+        resourceManager.createResourceWithWait(KafkaTopicTemplates.topic(testStorage.getNamespaceName(), testStorage.getTopicName(), testStorage.getClusterName()).build());
 
         final KafkaUser tlsExternalUserWithQuotasAndAcls = KafkaUserTemplates.tlsExternalUser(testStorage.getNamespaceName(), testStorage.getKafkaUsername(), testStorage.getClusterName())
             .editSpec()

systemtest/src/test/java/io/strimzi/systemtest/specific/DrainCleanerST.java

@@ -99,6 +99,7 @@ void setup() {
         setupClusterOperator
             .withCustomConfiguration(new ClusterOperatorConfigurationBuilder()
                 .withNamespaceName(TestConstants.DRAIN_CLEANER_NAMESPACE)
+                .withNamespacesToWatch(TestConstants.DRAIN_CLEANER_NAMESPACE)
                 .withOperationTimeout(TestConstants.CO_OPERATION_TIMEOUT_DEFAULT)
                 .build()
             )

systemtest/src/test/java/io/strimzi/systemtest/upgrade/AbstractKRaftUpgradeST.java

@@ -7,6 +7,8 @@
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.LabelSelectorBuilder;
 import io.fabric8.kubernetes.api.model.Pod;
+import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.testframe.resources.ResourceItem;
 import io.strimzi.api.kafka.model.common.Constants;
 import io.strimzi.api.kafka.model.connect.KafkaConnect;
 import io.strimzi.api.kafka.model.connect.KafkaConnectBuilder;
@@ -30,6 +32,7 @@
 import io.strimzi.systemtest.resources.crd.KafkaConnectResource;
 import io.strimzi.systemtest.resources.crd.KafkaNodePoolResource;
 import io.strimzi.systemtest.resources.crd.KafkaResource;
+import io.strimzi.systemtest.resources.crd.KafkaTopicResource;
 import io.strimzi.systemtest.storage.TestStorage;
 import io.strimzi.systemtest.templates.crd.KafkaConnectTemplates;
 import io.strimzi.systemtest.templates.crd.KafkaConnectorTemplates;
@@ -428,9 +431,12 @@ protected void deployKafkaConnectAndKafkaConnectorWithWaitForReadiness(
 
                 final String imageFullPath = Environment.getImageOutputRegistry(testStorage.getNamespaceName(), TestConstants.ST_CONNECT_BUILD_IMAGE_NAME, String.valueOf(new Random().nextInt(Integer.MAX_VALUE)));
 
+                LOGGER.info("Deploying KafkaConnect from: {}", kafkaConnectYaml.getPath());
+
                 KafkaConnect kafkaConnect = new KafkaConnectBuilder(ReadWriteUtils.readObjectFromYamlFilepath(kafkaConnectYaml, KafkaConnect.class))
                     .editMetadata()
                         .withName(CLUSTER_NAME)
+                        .withNamespace(testStorage.getNamespaceName())
                         .addToAnnotations(Annotations.STRIMZI_IO_USE_CONNECTOR_RESOURCES, "true")
                     .endMetadata()
                     .editSpec()
@@ -446,10 +452,7 @@ protected void deployKafkaConnectAndKafkaConnectorWithWaitForReadiness(
                     .endSpec()
                     .build();
 
-                LOGGER.info("Deploying KafkaConnect from: {}", kafkaConnectYaml.getPath());
-
-                cmdKubeClient(testStorage.getNamespaceName()).applyContent(ReadWriteUtils.writeObjectToYamlString(kafkaConnect));
-                ResourceManager.waitForResourceReadiness(testStorage.getNamespaceName(), getResourceApiVersion(KafkaConnect.RESOURCE_PLURAL), kafkaConnect.getMetadata().getName());
+                resourceManager.createResourceWithWait(kafkaConnect);
 
                 // in our examples is no sink connector and thus we are using the same as in HEAD verification
                 resourceManager.createResourceWithWait(KafkaConnectorTemplates.kafkaConnector(testStorage.getNamespaceName(), CLUSTER_NAME)
@@ -685,6 +688,7 @@ protected void applyCustomResourcesFromPath(String namespaceName, String example
         kafkaTopicYaml = new File(examplesPath + "/examples/topic/kafka-topic.yaml");
         LOGGER.info("Deploying KafkaTopic from: {}, in Namespace {}", kafkaTopicYaml.getPath(), namespaceName);
         cmdKubeClient(namespaceName).applyContent(ReadWriteUtils.readFile(kafkaTopicYaml));
+        KubeResourceManager.get().pushToStack(new ResourceItem<>(() -> KafkaTopicResource.kafkaTopicClient().inNamespace(namespaceName).withName("my-topic").delete()));
     }
 
     private String getKafkaYamlWithName(String name) {