Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Switch to container.image property keys
  • Loading branch information
kimoonkim committed Dec 18, 2017
commit 989a371094718156cce45b68e59a98d191af4c72
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,9 @@ private[spark] class KubernetesTestComponents(defaultClient: DefaultKubernetesCl
new SparkAppConf()
.set("spark.master", s"k8s://${kubernetesClient.getMasterUrl}")
.set("spark.kubernetes.namespace", namespace)
// TODO: apache/spark#19995 is changing docker.image to container.image in these properties.
// Update them once the PR is merged.
.set("spark.kubernetes.driver.docker.image",
.set("spark.kubernetes.driver.container.image",
System.getProperty("spark.docker.test.driverImage", "spark-driver:latest"))
.set("spark.kubernetes.executor.docker.image",
.set("spark.kubernetes.executor.container.image",
System.getProperty("spark.docker.test.executorImage", "spark-executor:latest"))
.set("spark.executor.memory", "500m")
.set("spark.executor.cores", "1")
Expand Down