Skip to content

Commit 4bed817

Browse files
committed
Removed default value for executor Docker image
1 parent a44c29e commit 4bed817

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.spark.deploy.k8s
1818

19-
import org.apache.spark.SPARK_VERSION
2019
import org.apache.spark.internal.Logging
2120
import org.apache.spark.internal.config.ConfigBuilder
2221
import org.apache.spark.network.util.ByteUnit
@@ -36,7 +35,7 @@ private[spark] object Config extends Logging {
3635
.doc("Docker image to use for the executors. Specify this using the standard Docker tag" +
3736
" format.")
3837
.stringConf
39-
.createWithDefault(s"spark-executor:$SPARK_VERSION")
38+
.createOptional
4039

4140
val DOCKER_IMAGE_PULL_POLICY =
4241
ConfigBuilder("spark.kubernetes.docker.image.pullPolicy")

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodFactory.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import scala.collection.JavaConverters._
2020

2121
import io.fabric8.kubernetes.api.model._
2222

23-
import org.apache.spark.SparkConf
23+
import org.apache.spark.{SparkConf, SparkException}
2424
import org.apache.spark.deploy.k8s.Config._
2525
import org.apache.spark.deploy.k8s.ConfigurationUtils
2626
import org.apache.spark.deploy.k8s.Constants._
@@ -72,7 +72,9 @@ private[spark] class ExecutorPodFactoryImpl(sparkConf: SparkConf)
7272
sparkConf,
7373
KUBERNETES_NODE_SELECTOR_PREFIX)
7474

75-
private val executorDockerImage = sparkConf.get(EXECUTOR_DOCKER_IMAGE)
75+
private val executorDockerImage = sparkConf
76+
.get(EXECUTOR_DOCKER_IMAGE)
77+
.getOrElse(throw new SparkException("Must specify the executor Docker image"))
7678
private val dockerImagePullPolicy = sparkConf.get(DOCKER_IMAGE_PULL_POLICY)
7779
private val blockManagerPort = sparkConf
7880
.getInt("spark.blockmanager.port", DEFAULT_BLOCKMANAGER_PORT)

0 commit comments

Comments
 (0)