generate ingress name independently

pan3793 · Apr 29, 2024 · 0c2c2c0 · 0c2c2c0
1 parent acc4965
commit 0c2c2c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...s/core/src/main/scala/org/apache/spark/deploy/k8s/features/DriverIngressFeatureStep.scala b/...s/core/src/main/scala/org/apache/spark/deploy/k8s/features/DriverIngressFeatureStep.scala
@@ -30,6 +30,7 @@ import org.apache.spark.internal.config.UI._
 class DriverIngressFeatureStep(kubernetesConf: KubernetesDriverConf)
   extends KubernetesFeatureConfigStep with Logging {
 
+  private val ingressName: String = s"${kubernetesConf.resourceNamePrefix}-ui-ingress"
   private lazy val driverServiceName: String = kubernetesConf.driverServiceName
 
   override def configurePod(pod: SparkPod): SparkPod = pod
@@ -82,7 +83,7 @@ class DriverIngressFeatureStep(kubernetesConf: KubernetesDriverConf)
 
     val ingress = new IngressBuilder()
       .withNewMetadata()
-        .withName(s"$driverServiceName-ingress")
+        .withName(ingressName)
         .addToLabels(labels.asJava)
         .addToAnnotations(annotations.asJava)
       .endMetadata()

diff --git a/...s/core/src/main/scala/org/apache/spark/deploy/k8s/features/DriverServiceFeatureStep.scala b/...s/core/src/main/scala/org/apache/spark/deploy/k8s/features/DriverServiceFeatureStep.scala
@@ -98,5 +98,5 @@ private[spark] object DriverServiceFeatureStep {
   val DRIVER_BIND_ADDRESS_KEY = config.DRIVER_BIND_ADDRESS.key
   val DRIVER_HOST_KEY = config.DRIVER_HOST_ADDRESS.key
   val DRIVER_SVC_POSTFIX = "-driver-svc"
-  val MAX_SERVICE_NAME_LENGTH = KUBERNETES_DNS_LABEL_NAME_MAX_LENGTH - "-ingress".length
+  val MAX_SERVICE_NAME_LENGTH = KUBERNETES_DNS_LABEL_NAME_MAX_LENGTH
 }