(zeppelin) branch master updated: [ZEPPELIN-6168] Fix k8s interpreter service name removing all dots from pod name

[chengpan]

This is an automated email from the ASF dual-hosted git repository.

chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 2717bed66b [ZEPPELIN-6168] Fix k8s interpreter service name removing 
all dots from pod name
2717bed66b is described below

commit 2717bed66b2840cc4d6a6a689df5f64791ecec0a
Author: Stanislav Porotikov <venom...@yandex.ru>
AuthorDate: Fri Mar 14 13:15:18 2025 +0300

    [ZEPPELIN-6168] Fix k8s interpreter service name removing all dots from pod 
name
    
    ### What is this PR for?
    Fix the problem with k8s interpreter service creating
    
    
    ### What type of PR is it?
    Bug Fix
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/projects/ZEPPELIN/issues/ZEPPELIN-6168
    
    ### How should this be tested?
    Compiled and tested manually.
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the license files need to update?
    * No
    * Is there breaking changes for older versions?
    * No
    * Does this needs documentation?
    * No
    
    
    Closes #4911 from venom13k/fix/k8s-interpreter-pod-name.
    
    Signed-off-by: Cheng Pan <cheng...@apache.org>
---
 .../zeppelin/interpreter/launcher/K8sUtils.java      |  2 +-
 .../zeppelin/interpreter/launcher/K8sUtilsTest.java  | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sUtils.java
 
b/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sUtils.java
index 01cdf91619..f064842753 100644
--- 
a/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sUtils.java
+++ 
b/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sUtils.java
@@ -160,7 +160,7 @@ public class K8sUtils {
       // Remove all disallowed values
       result = result.replaceAll("[^a-z0-9\\.-]", "");
       // Remove all multiple dots
-      result = result.replaceAll("\\.+", ".");
+      result = result.replaceAll("\\.+", "");
       if (result.isEmpty() || !Character.isLetterOrDigit(result.charAt(0))) {
         result = ZEPPELIN + result;
       }
diff --git 
a/zeppelin-plugins/launcher/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/K8sUtilsTest.java
 
b/zeppelin-plugins/launcher/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/K8sUtilsTest.java
index 70cad8b9be..40dcce0f25 100644
--- 
a/zeppelin-plugins/launcher/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/K8sUtilsTest.java
+++ 
b/zeppelin-plugins/launcher/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/K8sUtilsTest.java
@@ -41,17 +41,17 @@ class K8sUtilsTest {
 
   @Test
   void testExceptionMaxLong() {
-    assertThrows(NumberFormatException.class, () -> {
-      K8sUtils.calculateMemoryWithDefaultOverhead("10000000Tb");
-    });
+    assertThrows(NumberFormatException.class, () ->
+      K8sUtils.calculateMemoryWithDefaultOverhead("10000000Tb")
+    );
 
   }
 
   @Test
   void testExceptionNoValidNumber() {
-    assertThrows(NumberFormatException.class, () -> {
-      K8sUtils.calculateMemoryWithDefaultOverhead("NoValidNumber10000000Tb");
-    });
+    assertThrows(NumberFormatException.class, () ->
+      K8sUtils.calculateMemoryWithDefaultOverhead("NoValidNumber10000000Tb")
+    );
   }
 
   @Test
@@ -61,10 +61,10 @@ class K8sUtilsTest {
     assertEquals("test", K8sUtils.generateK8sName("test", false));
     assertEquals("test", K8sUtils.generateK8sName("!test", false));
     assertEquals("zeppelin", K8sUtils.generateK8sName("!", false));
-    assertEquals("zeppelin.test", K8sUtils.generateK8sName(".test", false));
-    assertEquals("zeppelin.test", K8sUtils.generateK8sName("...test", false));
-    assertEquals("zeppelin.test.zeppelin", K8sUtils.generateK8sName(".test.", 
false));
-    assertEquals("zeppelin.test.zeppelin", 
K8sUtils.generateK8sName("...test....", false));
+    assertEquals("test", K8sUtils.generateK8sName(".test", false));
+    assertEquals("test", K8sUtils.generateK8sName("...test", false));
+    assertEquals("test", K8sUtils.generateK8sName(".test.", false));
+    assertEquals("test", K8sUtils.generateK8sName("...test....", false));
     assertEquals("test", K8sUtils.generateK8sName("Test", false));
 
     assertEquals(253 - "zeppelin".length() , 
K8sUtils.generateK8sName(RandomStringUtils.randomAlphabetic(260), 
true).length());