Skip to content

[SPARK-58202][K8S] Skip driver containerPort declaration when the por… #57349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zhengchenyu wants to merge 2 commits into
base: master
Choose a base branch
from
+52 −20
Open

[SPARK-58202][K8S] Skip driver containerPort declaration when the por… #57349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab113e1
[SPARK-58202][K8S] Skip driver containerPort declaration when the por…
zhengchenyu Jul 18, 2026
0d5274e
trigger ci
zhengchenyu Jul 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions ...tes/core/src/main/scala/org/apache/spark/deploy/k8s/features/BasicDriverFeatureStep.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,30 +100,24 @@ private[spark] class BasicDriverFeatureStep(conf: KubernetesDriverConf)
val driverUIPort = SparkUI.getUIPort(conf.sparkConf)
val driverSparkConnectServerPort =
conf.sparkConf.getInt(CONNECT_GRPC_BINDING_PORT, DEFAULT_SPARK_CONNECT_SERVER_PORT)
// 0 is invalid as kubernetes containerPort request, we shall leave it unmounted.
val driverContainerPorts = Seq(
DRIVER_PORT_NAME -> driverPort,
BLOCK_MANAGER_PORT_NAME -> driverBlockManagerPort,
UI_PORT_NAME -> driverUIPort,
SPARK_CONNECT_SERVER_PORT_NAME -> driverSparkConnectServerPort
).collect { case (name, port) if port != 0 =>
new ContainerPortBuilder()
.withName(name)
.withContainerPort(port)
.withProtocol("TCP")
.build()
}
val driverContainer = new ContainerBuilder(pod.container)
.withName(Option(pod.container.getName).getOrElse(DEFAULT_DRIVER_CONTAINER_NAME))
.withImage(driverContainerImage)
.withImagePullPolicy(conf.imagePullPolicy)
.addNewPort()
.withName(DRIVER_PORT_NAME)
.withContainerPort(driverPort)
.withProtocol("TCP")
.endPort()
.addNewPort()
.withName(BLOCK_MANAGER_PORT_NAME)
.withContainerPort(driverBlockManagerPort)
.withProtocol("TCP")
.endPort()
.addNewPort()
.withName(UI_PORT_NAME)
.withContainerPort(driverUIPort)
.withProtocol("TCP")
.endPort()
.addNewPort()
.withName(SPARK_CONNECT_SERVER_PORT_NAME)
.withContainerPort(driverSparkConnectServerPort)
.withProtocol("TCP")
.endPort()
.addAllToPorts(driverContainerPorts.asJava)
.addNewEnv()
.withName(ENV_SPARK_USER)
.withValue(Utils.getCurrentUserName())
Expand Down
38 changes: 38 additions & 0 deletions ...ore/src/test/scala/org/apache/spark/deploy/k8s/features/BasicDriverFeatureStepSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,44 @@ class BasicDriverFeatureStepSuite extends SparkFunSuite {
assert(amountAndFormat(limits("memory")) === "5500Mi")
}

test("SPARK-58202: containerPort entries are skipped when the corresponding Spark port is 0") {
val sparkConf = new SparkConf()
.set(CONTAINER_IMAGE, "spark-driver:latest")
.set(KUBERNETES_DRIVER_POD_NAME, "spark-driver-pod")
.set(DRIVER_PORT, 0)
.set(DRIVER_BLOCK_MANAGER_PORT, 0)
.set(UI_PORT, 0)
.set(CONNECT_GRPC_BINDING_PORT, "0")
val kubernetesConf: KubernetesDriverConf = KubernetesTestConf.createDriverConf(
sparkConf = sparkConf,
environment = DRIVER_ENVS,
annotations = DRIVER_ANNOTATIONS)

val featureStep = new BasicDriverFeatureStep(kubernetesConf)
val configuredPod = featureStep.configurePod(SparkPod.initialPod())
assert(configuredPod.container.getPorts.isEmpty)
}

test("SPARK-58202: containerPort entries include only ports with non-zero values") {
val sparkConf = new SparkConf()
.set(CONTAINER_IMAGE, "spark-driver:latest")
.set(KUBERNETES_DRIVER_POD_NAME, "spark-driver-pod")
.set(DRIVER_PORT, 9000)
.set(DRIVER_BLOCK_MANAGER_PORT, 0)
.set(UI_PORT, 4040)
.set(CONNECT_GRPC_BINDING_PORT, "0")
val kubernetesConf: KubernetesDriverConf = KubernetesTestConf.createDriverConf(
sparkConf = sparkConf,
environment = DRIVER_ENVS,
annotations = DRIVER_ANNOTATIONS)

val featureStep = new BasicDriverFeatureStep(kubernetesConf)
val configuredPod = featureStep.configurePod(SparkPod.initialPod())
val portsByName = configuredPod.container.getPorts.asScala
.map(cp => cp.getName -> cp.getContainerPort).toMap
assert(portsByName === Map(DRIVER_PORT_NAME -> 9000, UI_PORT_NAME -> 4040))
}


def containerPort(name: String, portNumber: Int): ContainerPort =
new ContainerPortBuilder()
Expand Down