Skip to content

Commit 5278ea7

Browse files
committed
Addressed some more comments
1 parent 93e1d64 commit 5278ea7

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/steps/BasicDriverConfigurationStep.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private[spark] class BasicDriverConfigurationStep(
119119
.endEnv()
120120
.addNewEnv()
121121
.withName(ENV_DRIVER_ARGS)
122-
.withValue(appArgs.map(arg => "\"" + arg + "\"").mkString(" "))
122+
.withValue(appArgs.mkString(" "))
123123
.endEnv()
124124
.addNewEnv()
125125
.withName(ENV_DRIVER_BIND_ADDRESS)

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/SecretVolumeUtils.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@ import io.fabric8.kubernetes.api.model.{Container, Pod}
2323
private[spark] object SecretVolumeUtils {
2424

2525
def podHasVolume(pod: Pod, volumeName: String): Boolean = {
26-
pod.getSpec.getVolumes.asScala.exists(volume => volume.getName == volumeName)
26+
pod.getSpec.getVolumes.asScala.exists { volume =>
27+
volume.getName == volumeName
28+
}
2729
}
2830

2931
def containerHasVolume(container: Container, volumeName: String, mountPath: String): Boolean = {
30-
container.getVolumeMounts.asScala.exists(volumeMount =>
31-
volumeMount.getName == volumeName && volumeMount.getMountPath == mountPath)
32+
container.getVolumeMounts.asScala.exists { volumeMount =>
33+
volumeMount.getName == volumeName && volumeMount.getMountPath == mountPath
34+
}
3235
}
3336
}

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/submit/steps/BasicDriverConfigurationStepSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class BasicDriverConfigurationStepSuite extends SparkFunSuite {
3333
private val CONTAINER_IMAGE_PULL_POLICY = "IfNotPresent"
3434
private val APP_NAME = "spark-test"
3535
private val MAIN_CLASS = "org.apache.spark.examples.SparkPi"
36-
private val APP_ARGS = Array("arg1", "arg2", "arg 3")
36+
private val APP_ARGS = Array("arg1", "arg2", "\"arg 3\"")
3737
private val CUSTOM_ANNOTATION_KEY = "customAnnotation"
3838
private val CUSTOM_ANNOTATION_VALUE = "customAnnotationValue"
3939
private val DRIVER_CUSTOM_ENV_KEY1 = "customDriverEnv1"
@@ -82,7 +82,7 @@ class BasicDriverConfigurationStepSuite extends SparkFunSuite {
8282
assert(envs(ENV_SUBMIT_EXTRA_CLASSPATH) === "/opt/spark/spark-examples.jar")
8383
assert(envs(ENV_DRIVER_MEMORY) === "256M")
8484
assert(envs(ENV_DRIVER_MAIN_CLASS) === MAIN_CLASS)
85-
assert(envs(ENV_DRIVER_ARGS) === "\"arg1\" \"arg2\" \"arg 3\"")
85+
assert(envs(ENV_DRIVER_ARGS) === "arg1 arg2 \"arg 3\"")
8686
assert(envs(DRIVER_CUSTOM_ENV_KEY1) === "customDriverEnv1")
8787
assert(envs(DRIVER_CUSTOM_ENV_KEY2) === "customDriverEnv2")
8888

0 commit comments

Comments
 (0)