Addressed more comments

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

@@ -44,7 +44,7 @@ private[spark] object KubernetesUtils {
   }
 
   /**
-   * Append the given init-container to a pod's list of init-containers..
+   * Append the given init-container to a pod's list of init-containers.
    *
    * @param originalPodSpec original specification of the pod
    * @param initContainer the init-container to add to the pod

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

@@ -45,13 +45,12 @@ private[spark] class MountSecretsBootstrap(secretNamesToMountPaths: Map[String,
     }
 
     var containerBuilder = new ContainerBuilder(container)
-    secretNamesToMountPaths.foreach {
-      case (name, path) =>
-        containerBuilder = containerBuilder
-          .addNewVolumeMount()
-            .withName(secretVolumeName(name))
-            .withMountPath(path)
-            .endVolumeMount()
+    secretNamesToMountPaths.foreach { case (name, path) =>
+      containerBuilder = containerBuilder
+        .addNewVolumeMount()
+          .withName(secretVolumeName(name))
+          .withMountPath(path)
+          .endVolumeMount()
     }
 
     (podBuilder.build(), containerBuilder.build())

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

@@ -36,8 +36,7 @@ private[spark] class DependencyResolutionStep(
 
   override def configureDriver(driverSpec: KubernetesDriverSpec): KubernetesDriverSpec = {
     val resolvedSparkJars = KubernetesUtils.resolveFileUris(sparkJars, jarsDownloadPath)
-    val resolvedSparkFiles = KubernetesUtils.resolveFileUris(
-      sparkFiles, filesDownloadPath)
+    val resolvedSparkFiles = KubernetesUtils.resolveFileUris(sparkFiles, filesDownloadPath)
 
     val sparkConf = driverSpec.driverSparkConf.clone()
     if (resolvedSparkJars.nonEmpty) {

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

@@ -43,10 +43,8 @@ private[spark] class SparkPodInitContainer(
   private implicit val downloadExecutor = ExecutionContext.fromExecutorService(
     ThreadUtils.newDaemonCachedThreadPool("download-executor", maxThreadPoolSize))
 
-  private val jarsDownloadDir = new File(
-    sparkConf.get(JARS_DOWNLOAD_LOCATION))
-  private val filesDownloadDir = new File(
-    sparkConf.get(FILES_DOWNLOAD_LOCATION))
+  private val jarsDownloadDir = new File(sparkConf.get(JARS_DOWNLOAD_LOCATION))
+  private val filesDownloadDir = new File(sparkConf.get(FILES_DOWNLOAD_LOCATION))
 
   private val remoteJars = sparkConf.get(INIT_CONTAINER_REMOTE_JARS)
   private val remoteFiles = sparkConf.get(INIT_CONTAINER_REMOTE_FILES)
@@ -82,7 +80,6 @@ private[spark] class SparkPodInitContainer(
         Future[Unit] {
           fileFetcher.fetchFile(file, downloadDir)
         }
-
       }
     }
   }

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

@@ -79,6 +79,7 @@ class DriverInitContainerBootstrapStepSuite extends SparkFunSuite {
             SecondTestInitContainerConfigurationStep.additionalInitContainerPropertyValue)
         val hasMatchingProperties = initContainerPropertiesMap == expectedInitContainerProperties
         hasMatchingName && hasCorrectNumberOfEntries && hasMatchingProperties
+
       case _ => false
     })
 

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

@@ -26,7 +26,7 @@ class DriverMountSecretsStepSuite extends SparkFunSuite {
   private val SECRET_BAR = "bar"
   private val SECRET_MOUNT_PATH = "/etc/secrets/driver"
 
-  test("Mounts all given secrets") {
+  test("mounts all given secrets") {
     val baseDriverSpec = KubernetesDriverSpec.initialSpec(new SparkConf(false))
     val secretNamesToMountPaths = Map(
       SECRET_FOO -> SECRET_MOUNT_PATH,
@@ -38,10 +38,12 @@ class DriverMountSecretsStepSuite extends SparkFunSuite {
     val driverPodWithSecretsMounted = configuredDriverSpec.driverPod
     val driverContainerWithSecretsMounted = configuredDriverSpec.driverContainer
 
-    Seq(s"$SECRET_FOO-volume", s"$SECRET_BAR-volume").foreach(volumeName =>
-      assert(SecretVolumeUtils.podHasVolume(driverPodWithSecretsMounted, volumeName)))
-    Seq(s"$SECRET_FOO-volume", s"$SECRET_BAR-volume").foreach(volumeName =>
+    Seq(s"$SECRET_FOO-volume", s"$SECRET_BAR-volume").foreach { volumeName =>
+      assert(SecretVolumeUtils.podHasVolume(driverPodWithSecretsMounted, volumeName))
+    }
+    Seq(s"$SECRET_FOO-volume", s"$SECRET_BAR-volume").foreach { volumeName =>
       assert(SecretVolumeUtils.containerHasVolume(
-        driverContainerWithSecretsMounted, volumeName, SECRET_MOUNT_PATH)))
+        driverContainerWithSecretsMounted, volumeName, SECRET_MOUNT_PATH))
+    }
   }
 }

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

@@ -67,7 +67,7 @@ class BasicInitContainerConfigurationStepSuite extends SparkFunSuite with Before
         )}})
   }
 
-  test("Test of additionalDriverSparkConf with mix of remote files and jars") {
+  test("additionalDriverSparkConf with mix of remote files and jars") {
     val baseInitStep = new BasicInitContainerConfigurationStep(
       SPARK_JARS,
       SPARK_FILES,
@@ -88,8 +88,8 @@ class BasicInitContainerConfigurationStepSuite extends SparkFunSuite with Before
       Seq.empty[HasMetadata])
     val returnContainerSpec = baseInitStep.configureInitContainer(initContainerSpec)
     assert(expectedDriverSparkConf === returnContainerSpec.properties)
-    assert(returnContainerSpec.initContainer.getName == INIT_CONTAINER_NAME)
-    assert(returnContainerSpec.driverContainer.getName == DRIVER_CONTAINER_NAME)
+    assert(returnContainerSpec.initContainer.getName === INIT_CONTAINER_NAME)
+    assert(returnContainerSpec.driverContainer.getName === DRIVER_CONTAINER_NAME)
     assert(returnContainerSpec.driverPod.getMetadata.getLabels.asScala === POD_LABEL)
   }
 }

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

@@ -38,7 +38,7 @@ class InitContainerConfigOrchestratorSuite extends SparkFunSuite {
   private val SECRET_BAR = "bar"
   private val SECRET_MOUNT_PATH = "/etc/secrets/init-container"
 
-  test ("including basic configuration step") {
+  test("including basic configuration step") {
     val sparkConf = new SparkConf(true)
       .set(INIT_CONTAINER_IMAGE, DOCKER_IMAGE)
       .set(s"$KUBERNETES_DRIVER_LABEL_PREFIX$CUSTOM_LABEL_KEY", CUSTOM_LABEL_VALUE)
@@ -52,8 +52,7 @@ class InitContainerConfigOrchestratorSuite extends SparkFunSuite {
       INIT_CONTAINER_CONFIG_MAP_NAME,
       INIT_CONTAINER_CONFIG_MAP_KEY,
       sparkConf)
-    val initSteps : Seq[InitContainerConfigurationStep] =
-      orchestrator.getAllConfigurationSteps
+    val initSteps = orchestrator.getAllConfigurationSteps
     assert(initSteps.lengthCompare(1) == 0)
     assert(initSteps.head.isInstanceOf[BasicInitContainerConfigurationStep])
   }
@@ -73,8 +72,7 @@ class InitContainerConfigOrchestratorSuite extends SparkFunSuite {
       INIT_CONTAINER_CONFIG_MAP_NAME,
       INIT_CONTAINER_CONFIG_MAP_KEY,
       sparkConf)
-    val initSteps : Seq[InitContainerConfigurationStep] =
-      orchestrator.getAllConfigurationSteps
+    val initSteps = orchestrator.getAllConfigurationSteps
     assert(initSteps.length === 2)
     assert(initSteps.head.isInstanceOf[BasicInitContainerConfigurationStep])
     assert(initSteps(1).isInstanceOf[InitContainerMountSecretsStep])

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

@@ -28,7 +28,7 @@ class InitContainerMountSecretsStepSuite extends SparkFunSuite {
   private val SECRET_BAR = "bar"
   private val SECRET_MOUNT_PATH = "/etc/secrets/init-container"
 
-  test("Mounts all given secrets") {
+  test("mounts all given secrets") {
     val baseInitContainerSpec = InitContainerSpec(
       Map.empty,
       Map.empty,

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

@@ -29,10 +29,7 @@ import org.apache.spark.{SparkConf, SparkFunSuite}
 import org.apache.spark.deploy.k8s.Config._
 import org.apache.spark.util.Utils
 
-class SparkPodInitContainerSuite
-  extends SparkFunSuite with BeforeAndAfter {
-
-  import SparkPodInitContainerSuite.createTempFile
+class SparkPodInitContainerSuite extends SparkFunSuite with BeforeAndAfter {
 
   private val DOWNLOAD_JARS_SECRET_LOCATION = createTempFile("txt")
   private val DOWNLOAD_FILES_SECRET_LOCATION = createTempFile("txt")
@@ -79,10 +76,8 @@ class SparkPodInitContainerSuite
       .set(JARS_DOWNLOAD_LOCATION, downloadJarsDir.getAbsolutePath)
       .set(FILES_DOWNLOAD_LOCATION, downloadFilesDir.getAbsolutePath)
   }
-}
 
-private object SparkPodInitContainerSuite {
-  def createTempFile(extension: String): String = {
+  private def createTempFile(extension: String): String = {
     val dir = Utils.createTempDir()
     val file = new File(dir, s"${UUID.randomUUID().toString}.$extension")
     Files.write(UUID.randomUUID().toString, file, Charsets.UTF_8)