Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit 85a7c53

Browse files
committed
Mark KUBERNETES_DRIVER_POD_NAME not being internal. Update docment.
1 parent dad36fd commit 85a7c53

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

docs/running-on-kubernetes.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,13 @@ from the other deployment modes. See the [configuration page](configuration.html
350350
resource.
351351
</td>
352352
</tr>
353+
<tr>
354+
<td><code>spark.kubernetes.driver.pod.name</code></td>
355+
<td><code>(none)</code></td>
356+
<td>
357+
Name of the driver pod
358+
</td>
359+
</tr>
353360
<tr>
354361
<td><code>spark.kubernetes.submission.waitAppCompletion</code></td>
355362
<td><code>true</code></td>

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/config.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ package object config extends Logging {
267267
private[spark] val KUBERNETES_DRIVER_POD_NAME =
268268
ConfigBuilder("spark.kubernetes.driver.pod.name")
269269
.doc("Name of the driver pod.")
270-
.internal()
271270
.stringConf
272271
.createOptional
273272

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/v1/Client.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private[spark] class Client(
248248
logWarning(s"Warning: Provided app id in spark.app.id as $id will be" +
249249
s" overridden as $kubernetesAppId")
250250
}
251-
sparkConf.set(KUBERNETES_DRIVER_POD_NAME, kubernetesAppId)
251+
sparkConf.setIfMissing(KUBERNETES_DRIVER_POD_NAME, kubernetesAppId)
252252
sparkConf.set(KUBERNETES_DRIVER_SERVICE_NAME, driverService.getMetadata.getName)
253253
sparkConf.set("spark.app.id", kubernetesAppId)
254254
sparkConf.setIfMissing("spark.app.name", appName)

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/kubernetes/submit/v2/Client.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ private[spark] class Client(
177177
if (resolvedFiles.nonEmpty) {
178178
resolvedSparkConf.set("spark.files", resolvedFiles.mkString(","))
179179
}
180-
resolvedSparkConf.set(KUBERNETES_DRIVER_POD_NAME, kubernetesAppId)
180+
resolvedSparkConf.setIfMissing(KUBERNETES_DRIVER_POD_NAME, kubernetesAppId)
181181
resolvedSparkConf.set("spark.app.id", kubernetesAppId)
182182
// We don't need this anymore since we just set the JVM options on the environment
183183
resolvedSparkConf.remove(org.apache.spark.internal.config.DRIVER_JAVA_OPTIONS)

0 commit comments

Comments
 (0)