Skip to content

Commit 001fd35

Browse files
kornyskornys
authored
Update to strimzi 0.51.0 and migrate from test-frame to kubetest4j (#197)
* Update to strimzi 0.51.0 and migrate from test-frame to kubetest4j Signed-off-by: David Kornel <kornys@outlook.com> * fix Signed-off-by: David Kornel <kornys@outlook.com> --------- Signed-off-by: David Kornel <kornys@outlook.com>
1 parent 1435e58 commit 001fd35

43 files changed

Lines changed: 184 additions & 187 deletions

Some content is hidden

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

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
version: [17, 21, 25]
15+
version: [21, 25]
1616
steps:
1717
- uses: actions/checkout@v5
1818

‎Containerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.access.redhat.com/ubi9/openjdk-17:1.22
1+
FROM registry.access.redhat.com/ubi9/openjdk-21:latest
22

33
LABEL org.opencontainers.image.source='https://github.com/streamshub/streams-e2e'
44

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Test suite for verify interoperability of streams components like kafka, flink,
44

55
## Requirements
66
There is several requirements you have to have installed to properly build the project and run the tests:
7-
- Java 17+
7+
- Java 21+
88
- Helm 3+
99
- OperatorSDK
1010

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
**Description:** This test suite verifies that flink-sql-example works correctly
44

5-
**Before tests execution steps:**
5+
**Before test execution steps:**
66

77
| Step | Action | Result |
88
| - | - | - |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
**Description:** This test suite verifies that flink-sql-example works correctly
44

5-
**Before tests execution steps:**
5+
**Before test execution steps:**
66

77
| Step | Action | Result |
88
| - | - | - |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
**Description:** This test suite verifies that flink-sql can uses security kafka connection
44

5-
**Before tests execution steps:**
5+
**Before test execution steps:**
66

77
| Step | Action | Result |
88
| - | - | - |

‎pom.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
</issueManagement>
2222

2323
<properties>
24-
<maven.compiler.release>17</maven.compiler.release>
24+
<maven.compiler.release>21</maven.compiler.release>
2525
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2626

27-
<test-frame.version>1.2.0</test-frame.version>
27+
<kubetest4j.version>1.0.0</kubetest4j.version>
2828
<skodjob-doc.version>0.6.0</skodjob-doc.version>
29-
<fabric8.version>7.4.0</fabric8.version>
30-
<log4j.version>2.25.2</log4j.version>
29+
<fabric8.version>7.6.1</fabric8.version>
30+
<log4j.version>2.25.3</log4j.version>
3131
<slf4j.version>2.0.17</slf4j.version>
3232
<jackson.version>2.17.2</jackson.version>
3333

@@ -57,14 +57,14 @@
5757
<debezium.operator.files.destination>debezium</debezium.operator.files.destination>
5858
<keycloak.operator.files.destination>keycloak</keycloak.operator.files.destination>
5959
<!-- Operators versions -->
60-
<strimzi.version>0.48.0</strimzi.version>
60+
<strimzi.version>0.51.0</strimzi.version>
6161
<flink.version>1.12.1</flink.version>
6262
<cert.manager.version>1.18.2</cert.manager.version>
6363
<apicurio.registry.version>1.1.3-v2.6.4.final</apicurio.registry.version>
6464
<apicurio.api.version>1.1.2</apicurio.api.version>
6565
<apicurio.lib.version>2.6.13.Final</apicurio.lib.version>
6666
<debezium.operator.version>3.1.1</debezium.operator.version>
67-
<kafka.version>4.0.0</kafka.version>
67+
<kafka.version>4.2.0</kafka.version>
6868
<keycloak.version>26.3.3</keycloak.version>
6969
</properties>
7070

@@ -94,25 +94,25 @@
9494

9595
<dependencies>
9696
<dependency>
97-
<groupId>io.skodjob</groupId>
98-
<artifactId>test-frame-common</artifactId>
99-
<version>${test-frame.version}</version>
97+
<groupId>io.skodjob.kubetest4j</groupId>
98+
<artifactId>kubetest4j</artifactId>
99+
<version>${kubetest4j.version}</version>
100100
</dependency>
101101
<dependency>
102-
<groupId>io.skodjob</groupId>
103-
<artifactId>test-frame-kubernetes</artifactId>
104-
<version>${test-frame.version}</version>
102+
<groupId>io.skodjob.kubetest4j</groupId>
103+
<artifactId>kubernetes-resources</artifactId>
104+
<version>${kubetest4j.version}</version>
105105
<scope>test</scope>
106106
</dependency>
107107
<dependency>
108-
<groupId>io.skodjob</groupId>
109-
<artifactId>test-frame-openshift</artifactId>
110-
<version>${test-frame.version}</version>
108+
<groupId>io.skodjob.kubetest4j</groupId>
109+
<artifactId>openshift-resources</artifactId>
110+
<version>${kubetest4j.version}</version>
111111
</dependency>
112112
<dependency>
113-
<groupId>io.skodjob</groupId>
114-
<artifactId>test-frame-log-collector</artifactId>
115-
<version>${test-frame.version}</version>
113+
<groupId>io.skodjob.kubetest4j</groupId>
114+
<artifactId>log-collector</artifactId>
115+
<version>${kubetest4j.version}</version>
116116
</dependency>
117117
<dependency>
118118
<groupId>io.skodjob</groupId>
@@ -121,9 +121,9 @@
121121
<scope>test</scope>
122122
</dependency>
123123
<dependency>
124-
<groupId>io.skodjob</groupId>
125-
<artifactId>test-frame-metrics-collector</artifactId>
126-
<version>${test-frame.version}</version>
124+
<groupId>io.skodjob.kubetest4j</groupId>
125+
<artifactId>metrics-collector</artifactId>
126+
<version>${kubetest4j.version}</version>
127127
</dependency>
128128
<dependency>
129129
<groupId>io.fabric8</groupId>
@@ -411,7 +411,7 @@
411411
<ignoredUnusedDeclaredDependency>io.sundr:builder-annotations</ignoredUnusedDeclaredDependency>
412412
<ignoredUnusedDeclaredDependency>org.projectlombok:lombok</ignoredUnusedDeclaredDependency>
413413
<!-- Temporary exclusion as it will be needed when we start write something -->
414-
<ignoredUnusedDeclaredDependency>io.skodjob:test-frame-metrics-collector</ignoredUnusedDeclaredDependency>
414+
<ignoredUnusedDeclaredDependency>io.skodjob.kubetest4j:metrics-collector</ignoredUnusedDeclaredDependency>
415415
<ignoredUnusedDeclaredDependency>io.fabric8:openshift-client</ignoredUnusedDeclaredDependency>
416416
<ignoredUnusedDeclaredDependency>io.fabric8:kubernetes-model</ignoredUnusedDeclaredDependency>
417417
<ignoredUnusedDeclaredDependency>org.junit.jupiter:junit-jupiter-engine</ignoredUnusedDeclaredDependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
package io.streams;
66

7-
import io.skodjob.testframe.environment.TestEnvironmentVariables;
7+
import io.skodjob.kubetest4j.environment.TestEnvironmentVariables;
88
import org.slf4j.Logger;
99
import org.slf4j.LoggerFactory;
1010

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
package io.streams.listeners;
66

77
import io.fabric8.kubernetes.api.model.LabelSelectorBuilder;
8-
import io.skodjob.testframe.LogCollector;
9-
import io.skodjob.testframe.LogCollectorBuilder;
10-
import io.skodjob.testframe.interfaces.MustGatherSupplier;
11-
import io.skodjob.testframe.resources.KubeResourceManager;
8+
import io.skodjob.kubetest4j.LogCollector;
9+
import io.skodjob.kubetest4j.LogCollectorBuilder;
10+
import io.skodjob.kubetest4j.interfaces.MustGatherSupplier;
11+
import io.skodjob.kubetest4j.resources.KubeResourceManager;
1212
import io.streams.Environment;
1313
import io.streams.constants.KubeResourceConstants;
1414
import io.streams.constants.TestConstants;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
1010
import io.fabric8.kubernetes.client.dsl.MixedOperation;
1111
import io.fabric8.kubernetes.client.dsl.Resource;
12-
import io.skodjob.testframe.interfaces.ResourceType;
13-
import io.skodjob.testframe.resources.KubeResourceManager;
12+
import io.skodjob.kubetest4j.interfaces.ResourceType;
13+
import io.skodjob.kubetest4j.resources.KubeResourceManager;
1414
import org.slf4j.Logger;
1515
import org.slf4j.LoggerFactory;
1616

0 commit comments

Comments
 (0)