Update to strimzi 0.51.0 and migrate from test-frame to kubetest4j

.github/workflows/build.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [17, 21, 25]
+        version: [21, 25]
     steps:
       - uses: actions/checkout@v5
 

Containerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/openjdk-17:1.22
+FROM registry.access.redhat.com/ubi9/openjdk-21:latest
 
 LABEL org.opencontainers.image.source='https://github.com/streamshub/streams-e2e'
 

README.md

@@ -4,7 +4,7 @@ Test suite for verify interoperability of streams components like kafka, flink,
 
 ## Requirements
 There is several requirements you have to have installed to properly build the project and run the tests:
-- Java 17+
+- Java 21+
 - Helm 3+
 - OperatorSDK
 

docs/io/streams/e2e/flink/sql/SqlExampleST.md

@@ -2,7 +2,7 @@
 
 **Description:** This test suite verifies that flink-sql-example works correctly
 
-**Before tests execution steps:**
+**Before test execution steps:**
 
 | Step | Action | Result |
 | - | - | - |

docs/io/streams/e2e/flink/sql/SqlJobRunnerST.md

@@ -2,7 +2,7 @@
 
 **Description:** This test suite verifies that flink-sql-example works correctly
 
-**Before tests execution steps:**
+**Before test execution steps:**
 
 | Step | Action | Result |
 | - | - | - |

docs/io/streams/e2e/flink/sql/SqlSecurityST.md

@@ -2,7 +2,7 @@
 
 **Description:** This test suite verifies that flink-sql can uses security kafka connection
 
-**Before tests execution steps:**
+**Before test execution steps:**
 
 | Step | Action | Result |
 | - | - | - |

pom.xml

@@ -21,13 +21,13 @@
     </issueManagement>
 
     <properties>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <test-frame.version>1.2.0</test-frame.version>
+        <kubetest4j.version>1.0.0</kubetest4j.version>
         <skodjob-doc.version>0.6.0</skodjob-doc.version>
-        <fabric8.version>7.4.0</fabric8.version>
-        <log4j.version>2.25.2</log4j.version>
+        <fabric8.version>7.6.1</fabric8.version>
+        <log4j.version>2.25.3</log4j.version>
         <slf4j.version>2.0.17</slf4j.version>
         <jackson.version>2.17.2</jackson.version>
 
@@ -57,14 +57,14 @@
         <debezium.operator.files.destination>debezium</debezium.operator.files.destination>
         <keycloak.operator.files.destination>keycloak</keycloak.operator.files.destination>
         <!-- Operators versions -->
-        <strimzi.version>0.48.0</strimzi.version>
+        <strimzi.version>0.51.0</strimzi.version>
         <flink.version>1.12.1</flink.version>
         <cert.manager.version>1.18.2</cert.manager.version>
         <apicurio.registry.version>1.1.3-v2.6.4.final</apicurio.registry.version>
         <apicurio.api.version>1.1.2</apicurio.api.version>
         <apicurio.lib.version>2.6.13.Final</apicurio.lib.version>
         <debezium.operator.version>3.1.1</debezium.operator.version>
-        <kafka.version>4.0.0</kafka.version>
+        <kafka.version>4.2.0</kafka.version>
         <keycloak.version>26.3.3</keycloak.version>
     </properties>
 
@@ -94,25 +94,25 @@
 
     <dependencies>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-common</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>kubetest4j</artifactId>
+            <version>${kubetest4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-kubernetes</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>kubernetes-resources</artifactId>
+            <version>${kubetest4j.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-openshift</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>openshift-resources</artifactId>
+            <version>${kubetest4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-log-collector</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>log-collector</artifactId>
+            <version>${kubetest4j.version}</version>
         </dependency>
         <dependency>
             <groupId>io.skodjob</groupId>
@@ -121,9 +121,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.skodjob</groupId>
-            <artifactId>test-frame-metrics-collector</artifactId>
-            <version>${test-frame.version}</version>
+            <groupId>io.skodjob.kubetest4j</groupId>
+            <artifactId>metrics-collector</artifactId>
+            <version>${kubetest4j.version}</version>
         </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
@@ -411,7 +411,7 @@
                                 <ignoredUnusedDeclaredDependency>io.sundr:builder-annotations</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.projectlombok:lombok</ignoredUnusedDeclaredDependency>
                                 <!-- Temporary exclusion as it will be needed when we start write something -->
-                                <ignoredUnusedDeclaredDependency>io.skodjob:test-frame-metrics-collector</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>io.skodjob.kubetest4j:metrics-collector</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>io.fabric8:openshift-client</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>io.fabric8:kubernetes-model</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredUnusedDeclaredDependency>

src/main/java/io/streams/Environment.java

@@ -4,7 +4,7 @@
  */
 package io.streams;
 
-import io.skodjob.testframe.environment.TestEnvironmentVariables;
+import io.skodjob.kubetest4j.environment.TestEnvironmentVariables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/io/streams/listeners/MustGatherImpl.java

@@ -5,10 +5,10 @@
 package io.streams.listeners;
 
 import io.fabric8.kubernetes.api.model.LabelSelectorBuilder;
-import io.skodjob.testframe.LogCollector;
-import io.skodjob.testframe.LogCollectorBuilder;
-import io.skodjob.testframe.interfaces.MustGatherSupplier;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.LogCollector;
+import io.skodjob.kubetest4j.LogCollectorBuilder;
+import io.skodjob.kubetest4j.interfaces.MustGatherSupplier;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.streams.Environment;
 import io.streams.constants.KubeResourceConstants;
 import io.streams.constants.TestConstants;

src/main/java/io/streams/operands/apicurio/resources/ApicurioRegistryType.java

@@ -9,8 +9,8 @@
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/io/streams/operands/certmanager/templates/CertManagerCaTemplate.java

@@ -5,7 +5,7 @@
 package io.streams.operands.certmanager.templates;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/io/streams/operands/flink/resoruces/FlinkDeploymentType.java

@@ -7,8 +7,8 @@
 import io.fabric8.kubernetes.api.model.KubernetesResourceList;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import org.apache.flink.v1beta1.FlinkDeployment;
 import org.apache.flink.v1beta1.FlinkDeploymentStatus;
 import org.slf4j.Logger;

src/main/java/io/streams/operands/flink/templates/FlinkDeploymentTemplate.java

@@ -6,7 +6,7 @@
 
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaimBuilder;
 import io.fabric8.kubernetes.api.model.Quantity;
-import io.skodjob.testframe.utils.KubeUtils;
+import io.skodjob.kubetest4j.utils.KubeUtils;
 import io.streams.Environment;
 import org.apache.flink.v1beta1.FlinkDeploymentBuilder;
 import org.apache.flink.v1beta1.FlinkDeploymentSpec;

src/main/java/io/streams/operands/keycloak/templates/KeycloakDeploymentTemplate.java

@@ -5,7 +5,7 @@
 package io.streams.operands.keycloak.templates;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 
 import java.io.IOException;
 import java.util.List;

src/main/java/io/streams/operands/minio/MinioInstaller.java

@@ -14,7 +14,7 @@
 import io.fabric8.kubernetes.api.model.VolumeMountBuilder;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.streams.constants.TestConstants;
 import java.util.Map;
 

src/main/java/io/streams/operands/strimzi/resources/KafkaBridgeType.java

@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.bridge.KafkaBridge;
 import io.strimzi.api.kafka.model.bridge.KafkaBridgeList;

src/main/java/io/streams/operands/strimzi/resources/KafkaConnectType.java

@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.connect.KafkaConnect;
 import io.strimzi.api.kafka.model.connect.KafkaConnectList;

src/main/java/io/streams/operands/strimzi/resources/KafkaConnectorType.java

@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.connector.KafkaConnector;
 import io.strimzi.api.kafka.model.connector.KafkaConnectorList;

src/main/java/io/streams/operands/strimzi/resources/KafkaMirrorMaker2Type.java

@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2;
 import io.strimzi.api.kafka.model.mirrormaker2.KafkaMirrorMaker2List;

src/main/java/io/streams/operands/strimzi/resources/KafkaNodePoolType.java

@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.nodepool.KafkaNodePool;
 import io.strimzi.api.kafka.model.nodepool.KafkaNodePoolList;

src/main/java/io/streams/operands/strimzi/resources/KafkaRebalanceType.java

@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.rebalance.KafkaRebalance;
 import io.strimzi.api.kafka.model.rebalance.KafkaRebalanceList;

src/main/java/io/streams/operands/strimzi/resources/KafkaTopicType.java

@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.topic.KafkaTopic;
 import io.strimzi.api.kafka.model.topic.KafkaTopicList;

src/main/java/io/streams/operands/strimzi/resources/KafkaType.java

@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.kafka.Kafka;
 import io.strimzi.api.kafka.model.kafka.KafkaList;

src/main/java/io/streams/operands/strimzi/resources/KafkaUserType.java

@@ -6,8 +6,8 @@
 
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.skodjob.testframe.interfaces.ResourceType;
-import io.skodjob.testframe.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.interfaces.ResourceType;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
 import io.strimzi.api.kafka.Crds;
 import io.strimzi.api.kafka.model.user.KafkaUser;
 import io.strimzi.api.kafka.model.user.KafkaUserList;

src/main/java/io/streams/operands/strimzi/templates/KafkaTemplate.java

@@ -4,7 +4,6 @@
  */
 package io.streams.operands.strimzi.templates;
 
-import io.strimzi.api.ResourceAnnotations;
 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;
@@ -15,8 +14,6 @@ public static KafkaBuilder defaultKafka(String namespace, String name) {
         return new KafkaBuilder()
             .withNewMetadata()
             .withNamespace(namespace)
-            .addToAnnotations(ResourceAnnotations.ANNO_STRIMZI_IO_NODE_POOLS, "enabled")
-            .addToAnnotations(ResourceAnnotations.ANNO_STRIMZI_IO_KRAFT, "enabled")
             .withName(name)
             .endMetadata()
             .withNewSpec()

src/main/java/io/streams/operators/manifests/ApicurioRegistryManifestInstaller.java

@@ -14,9 +14,9 @@
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.wait.Wait;
 import io.streams.constants.TestConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,8 +84,8 @@ public static CompletableFuture<Void> install() throws IOException {
             KubeResourceManager.get().createOrUpdateResourceWithoutWait(res);
         });
         LOGGER.info("Apicurio Registry operator installed to namespace: {}", OPERATOR_NS);
-        return Wait.untilAsync("Apicurio Registry operator readiness", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, ApicurioRegistryManifestInstaller::isReady);
+        return Wait.untilAsync("Apicurio Registry operator readiness", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, ApicurioRegistryManifestInstaller::isReady);
     }
 
     private static void modifyDeployment(Deployment deployment) {

src/main/java/io/streams/operators/manifests/CertManagerManifestInstaller.java

@@ -9,9 +9,9 @@
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.fabric8.kubernetes.api.model.rbac.RoleBinding;
-import io.skodjob.testframe.TestFrameConstants;
-import io.skodjob.testframe.resources.KubeResourceManager;
-import io.skodjob.testframe.wait.Wait;
+import io.skodjob.kubetest4j.KubeTestConstants;
+import io.skodjob.kubetest4j.resources.KubeResourceManager;
+import io.skodjob.kubetest4j.wait.Wait;
 import io.streams.constants.TestConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -81,8 +81,8 @@ public static CompletableFuture<Void> install() throws IOException {
             KubeResourceManager.get().createOrUpdateResourceWithoutWait(res);
         });
         LOGGER.info("Cert-manager installed to namespace: {}", OPERATOR_NS);
-        return Wait.untilAsync("Cert-manager readiness", TestFrameConstants.GLOBAL_POLL_INTERVAL_1_SEC,
-            TestFrameConstants.GLOBAL_TIMEOUT, CertManagerManifestInstaller::isReady);
+        return Wait.untilAsync("Cert-manager readiness", KubeTestConstants.GLOBAL_POLL_INTERVAL_1_SEC,
+            KubeTestConstants.GLOBAL_TIMEOUT, CertManagerManifestInstaller::isReady);
     }
 
     private static boolean isReady() {