Use new test-frame and new fabric8 with new builders (#99)

streamshub · Jan 2, 2025 · 6ca3058 · 6ca3058
1 parent 5b8fe12
commit 6ca3058
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -24,9 +24,9 @@
         <maven.compiler.release>17</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <test-frame.version>0.8.0</test-frame.version>
+        <test-frame.version>0.9.0</test-frame.version>
         <skodjob-doc.version>0.3.0</skodjob-doc.version>
-        <fabric8.version>6.13.4</fabric8.version>
+        <fabric8.version>7.0.1</fabric8.version>
         <log4j.version>2.24.3</log4j.version>
         <slf4j.version>2.0.16</slf4j.version>
         <jackson.version>2.17.2</jackson.version>
@@ -130,11 +130,6 @@
             <version>${fabric8.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>io.fabric8</groupId>
-            <artifactId>kubernetes-model</artifactId>
-            <version>${fabric8.version}</version>
-        </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>kubernetes-model-core</artifactId>

diff --git a/src/main/java/io/streams/operands/flink/templates/FlinkDeploymentTemplate.java b/src/main/java/io/streams/operands/flink/templates/FlinkDeploymentTemplate.java
@@ -47,13 +47,13 @@ public static FlinkDeploymentBuilder defaultFlinkDeployment(String namespace, St
             .withKind("Pod")
             .withNewMetadata()
             .withName(name)
-            .endFlinkdeploymentspecMetadata()
+            .endMetadata()
             .withNewSpec()
             .addNewContainer()
             .withName("flink-main-container")
             .withImagePullPolicy("Always")
-            .endFlinkdeploymentspecContainer()
-            .endFlinkdeploymentspecSpec()
+            .endContainer()
+            .endSpec()
             .endPodTemplate()
             .withNewJobManager()
             .withNewResource()
@@ -65,7 +65,7 @@ public static FlinkDeploymentBuilder defaultFlinkDeployment(String namespace, St
             .withNewResource()
             .withCpu(1.0)
             .withMemory("2048m")
-            .endTaskmanagerResource()
+            .endResource()
             .endTaskManager()
             .withNewJob()
             .withJarURI("local:///opt/streamshub/flink-sql-runner.jar")
@@ -96,24 +96,24 @@ public static FlinkDeploymentBuilder flinkExampleDeployment(String namespace, St
         return defaultFlinkDeployment(namespace, name, sqlStatements)
             .editSpec()
             .editPodTemplate()
-            .editFlinkdeploymentspecSpec()
+            .editSpec()
             .editFirstContainer()
             .addNewVolumeMount()
             .withName("product-inventory-vol")
             .withMountPath("/opt/flink/data")
-            .endFlinkdeploymentspecVolumeMount()
-            .endFlinkdeploymentspecContainer()
+            .endVolumeMount()
+            .endContainer()
             .addNewVolume()
             .withName("product-inventory-vol")
             .withNewConfigMap()
             .withName("product-inventory")
             .addNewItem()
             .withKey("productInventory.csv")
             .withPath("productInventory.csv")
-            .endFlinkdeploymentspecItem()
-            .endFlinkdeploymentspecConfigMap()
-            .endFlinkdeploymentspecVolume()
-            .endFlinkdeploymentspecSpec()
+            .endItem()
+            .endConfigMap()
+            .endVolume()
+            .endSpec()
             .endPodTemplate()
             .endSpec();
     }

diff --git a/src/test/java/io/streams/e2e/flink/sql/SqlJobRunnerST.java b/src/test/java/io/streams/e2e/flink/sql/SqlJobRunnerST.java
@@ -495,15 +495,15 @@ void testFRocksDbStateBackend() {
             .addNewVolumeMount()
             .withMountPath("/flink-state-store")
             .withName("flink-state-store")
-            .endFlinkdeploymentspecVolumeMount()
-            .endFlinkdeploymentspecContainer()
+            .endVolumeMount()
+            .endContainer()
             .addNewVolume()
             .withName("flink-state-store")
             .withNewPersistentVolumeClaim()
             .withClaimName(flinkPVC.getMetadata().getName())
-            .endFlinkdeploymentspecPersistentVolumeClaim()
-            .endFlinkdeploymentspecVolume()
-            .endFlinkdeploymentspecSpec()
+            .endPersistentVolumeClaim()
+            .endVolume()
+            .endSpec()
             .endPodTemplate()
             .endSpec()
             .build();
@@ -749,8 +749,8 @@ void testS3StateBackend() {
             .editPodTemplate()
             .editOrNewSpec()
             .editFirstContainer()
-            .endFlinkdeploymentspecContainer()
-            .endFlinkdeploymentspecSpec()
+            .endContainer()
+            .endSpec()
             .endPodTemplate()
             .endSpec()
             .build();