Upgrading fabric k8s client for k8s overlord extensions

extensions-contrib/kubernetes-overlord-extensions/pom.xml

@@ -104,7 +104,7 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-core</artifactId>
-      <version>5.12.2</version>
+      <version>6.4.1</version>
     </dependency>
     <dependency>
       <groupId>javax.validation</groupId>
@@ -114,12 +114,12 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-model-batch</artifactId>
-      <version>5.12.2</version>
+      <version>6.4.1</version>
     </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-client</artifactId>
-      <version>5.12.2</version>
+      <version>6.4.1</version>
     </dependency>
 
     <!-- Tests -->
@@ -136,7 +136,7 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-server-mock</artifactId>
-      <version>5.12.2</version>
+      <version>6.4.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -226,6 +226,12 @@
       <artifactId>equalsverifier</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.kubernetes</groupId>
+      <artifactId>client-java-proto</artifactId>
+      <version>11.0.1</version>
+      <scope>compile</scope>
+    </dependency>
 
   </dependencies>
 

extensions-contrib/kubernetes-overlord-extensions/src/main/java/org/apache/druid/k8s/overlord/common/DruidKubernetesPeonClient.java

@@ -78,7 +78,7 @@ public Pod launchJobAndWaitForStart(Job job, long howLong, TimeUnit timeUnit)
     long start = System.currentTimeMillis();
     // launch job
     return clientApi.executeRequest(client -> {
-      client.batch().v1().jobs().inNamespace(namespace).create(job);
+      client.batch().v1().jobs().inNamespace(namespace).withName(job.getMetadata().getName()).create();
       K8sTaskId taskId = new K8sTaskId(job.getMetadata().getName());
       log.info("Successfully submitted job: %s ... waiting for job to launch", taskId);
       // wait until the pod is running or complete or failed, any of those is fine
@@ -121,12 +121,12 @@ public JobResponse waitForJobCompletion(K8sTaskId taskId, long howLong, TimeUnit
   public boolean cleanUpJob(K8sTaskId taskId)
   {
     if (!debugJobs) {
-      Boolean result = clientApi.executeRequest(client -> client.batch()
+      Boolean result = clientApi.executeRequest(client -> !client.batch()
                                                                 .v1()
                                                                 .jobs()
                                                                 .inNamespace(namespace)
                                                                 .withName(taskId.getK8sTaskId())
-                                                                .delete());
+                                                                .delete().isEmpty());
       if (result) {
         log.info("Cleaned up k8s task: %s", taskId);
       } else {
@@ -216,7 +216,12 @@ public int cleanCompletedJobsOlderThan(long howFarBack, TimeUnit timeUnit)
     return clientApi.executeRequest(client -> {
       List<Job> jobs = getJobsToCleanup(listAllPeonJobs(), howFarBack, timeUnit);
       jobs.forEach(x -> {
-        if (client.batch().v1().jobs().inNamespace(namespace).withName(x.getMetadata().getName()).delete()) {
+        if (!client.batch()
+                   .v1()
+                   .jobs()
+                   .inNamespace(namespace)
+                   .withName(x.getMetadata().getName())
+                   .delete().isEmpty()) {
           numDeleted.incrementAndGet();
         }
       });

extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/K8sTestUtils.java

@@ -27,6 +27,7 @@
 import io.fabric8.kubernetes.api.model.PodSpecBuilder;
 import io.fabric8.kubernetes.api.model.PodTemplateSpec;
 import io.fabric8.kubernetes.api.model.batch.v1.Job;
+import io.fabric8.kubernetes.client.utils.Serialization;
 import org.apache.commons.text.CharacterPredicates;
 import org.apache.commons.text.RandomStringGenerator;
 import org.apache.druid.data.input.impl.DimensionsSpec;
@@ -142,4 +143,11 @@ public static Task getTask()
     );
   }
 
+  public static <T> T fileToResource(String contents, Class<T> type)
+  {
+    return Serialization.unmarshal(
+        MultiContainerTaskAdapter.class.getClassLoader().getResourceAsStream(contents),
+        type
+    );
+  }
 }

extensions-contrib/kubernetes-overlord-extensions/src/test/java/org/apache/druid/k8s/overlord/common/SingleContainerTaskAdapterTest.java

@@ -65,9 +65,7 @@ public SingleContainerTaskAdapterTest()
   public void testSingleContainerSupport() throws IOException
   {
     TestKubernetesClient testClient = new TestKubernetesClient(client);
-    Pod pod = client.pods()
-                    .load(this.getClass().getClassLoader().getResourceAsStream("multiContainerPodSpec.yaml"))
-                    .get();
+    Pod pod = K8sTestUtils.fileToResource("multiContainerPodSpec.yaml", Pod.class);
     KubernetesTaskRunnerConfig config = new KubernetesTaskRunnerConfig();
     config.namespace = "test";
     SingleContainerTaskAdapter adapter = new SingleContainerTaskAdapter(testClient, config, jsonMapper);
@@ -81,13 +79,7 @@ public void testSingleContainerSupport() throws IOException
             new File("/tmp")
         )
     );
-    Job expected = client.batch()
-                         .v1()
-                         .jobs()
-                         .load(this.getClass()
-                                   .getClassLoader()
-                                   .getResourceAsStream("expectedSingleiContainerOutput.yaml"))
-                         .get();
+    Job expected = K8sTestUtils.fileToResource("expectedSingleiContainerOutput.yaml", Job.class);
     // something is up with jdk 17, where if you compress with jdk < 17 and try and decompress you get different results,
     // this would never happen in real life, but for the jdk 17 tests this is a problem
     // could be related to: https://bugs.openjdk.org/browse/JDK-8081450

licenses.yaml

@@ -901,7 +901,7 @@ name: kubernetes fabric java client
 license_category: binary
 module: extensions-contrib/kubernetes-overlord-extensions
 license_name: Apache License version 2.0
-version: 5.12.2
+version: 6.4.1
 libraries:
   - io.fabric8: kubernetes-client