Update kubernetes client to 5.4.1 and fix unit tests

Author: Reamer

zeppelin-plugins/launcher/k8s-standard/pom.xml

@@ -35,7 +35,7 @@
 
     <properties>
         <plugin.name>Launcher/K8sStandardInterpreterLauncher</plugin.name>
-        <kubernetes.client.version>5.3.2</kubernetes.client.version>
+        <kubernetes.client.version>5.4.1</kubernetes.client.version>
         <jinjava.version>2.5.4</jinjava.version>
     </properties>
 

zeppelin-plugins/launcher/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcessTest.java

@@ -46,7 +46,7 @@
 public class K8sRemoteInterpreterProcessTest {
 
   @Rule
-  public KubernetesServer server = new KubernetesServer(false, true);
+  public KubernetesServer server = new KubernetesServer(true, true);
 
   @Test
   public void testPredefinedPortNumbers() {

zeppelin-plugins/launcher/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/PodPhaseWatcherTest.java

@@ -23,7 +23,6 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.lang3.StringUtils;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -39,10 +38,9 @@
 public class PodPhaseWatcherTest {
 
   @Rule
-  public KubernetesServer server = new KubernetesServer(false, true);
+  public KubernetesServer server = new KubernetesServer(true, true);
 
   @Test
-  @Ignore("Reamer - ZEPPELIN-5403")
   public void testPhase() throws InterruptedException {
     KubernetesClient client = server.getClient();
     // CREATE
@@ -56,24 +54,25 @@ public void testPhase() throws InterruptedException {
     // WATCH
     PodPhaseWatcher podWatcher = new PodPhaseWatcher(
         phase -> StringUtils.equalsAnyIgnoreCase(phase, "Succeeded", "Failed", "Running"));
-    Watch watch = client.pods().inNamespace("ns1").withName("pod1").watch(podWatcher);
+    try (Watch watch = client.pods().inNamespace("ns1").withName("pod1").watch(podWatcher)) {
 
-    // Update Pod to "pending" phase
-    pod.setStatus(new PodStatus(null, null, null, null, null, null, null, "Pending", null, null,
-        null, null, null));
-    client.pods().inNamespace("ns1").updateStatus(pod);
+      // Update Pod to "pending" phase
+      pod.setStatus(new PodStatus(null, null, null, null, null, null, null, "Pending", null, null,
+              null, null, null));
+      pod = client.pods().inNamespace("ns1").updateStatus(pod);
 
-    // Update Pod to "Running" phase
-    pod.setStatus(new PodStatusBuilder(new PodStatus(null, null, null, null, null, null, null,
-        "Running", null, null, null, null, null)).build());
-    client.pods().inNamespace("ns1").updateStatus(pod);
+      // Wait a little bit, till update is applied
+      Thread.sleep(1000);
+      // Update Pod to "Running" phase
+      pod.setStatus(new PodStatusBuilder(new PodStatus(null, null, null, null, null, null, null,
+              "Running", null, null, null, null, null)).build());
+      client.pods().inNamespace("ns1").updateStatus(pod);
 
-    assertTrue(podWatcher.getCountDownLatch().await(1, TimeUnit.SECONDS));
-    watch.close();
+      assertTrue(podWatcher.getCountDownLatch().await(1, TimeUnit.SECONDS));
+    }
   }
 
   @Test
-  @Ignore("Reamer - ZEPPELIN-5403")
   public void testPhaseWithError() throws InterruptedException {
     KubernetesClient client = server.getClient();
     // CREATE