third round of PR comments

Author: ifilonenko

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

@@ -42,7 +42,7 @@ private[spark] trait HadoopConfBootstrap {
 private[spark] class HadoopConfBootstrapImpl(
   hadoopConfConfigMapName: String,
   hadoopConfigFiles: Seq[File],
-  hadoopUGI: HadoopUGIUtil) extends HadoopConfBootstrap with Logging{
+  hadoopUGI: HadoopUGIUtil) extends HadoopConfBootstrap with Logging {
 
   override def bootstrapMainContainerAndVolumes(
     originalPodWithMainContainer: PodWithMainContainer)

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

@@ -74,7 +74,9 @@ private[spark] class HadoopUGIUtil{
   @deprecated("Moved to core in 2.3", "2.3")
   def deserialize(tokenBytes: Array[Byte]): Credentials = {
     val creds = new Credentials()
-    creds.readTokenStorageStream(new DataInputStream(new ByteArrayInputStream(tokenBytes)))
+    val dataStream = new DataInputStream(new ByteArrayInputStream(tokenBytes))
+    creds.readTokenStorageStream(dataStream)
+    dataStream.close()
     creds
   }
 }

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

@@ -37,7 +37,7 @@ private[spark] trait KerberosTokenConfBootstrap {
 private[spark] class KerberosTokenConfBootstrapImpl(
   secretName: String,
   secretItemKey: String,
-  userName: String) extends KerberosTokenConfBootstrap with Logging{
+  userName: String) extends KerberosTokenConfBootstrap with Logging {
 
   override def bootstrapMainContainerAndVolumes(
   originalPodWithMainContainer: PodWithMainContainer)

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

@@ -53,13 +53,13 @@ private[spark] class HadoopConfigBootstrapStep(
           .endMetadata()
         .addToData(currentHadoopSpec.configMapProperties.asJava)
       .build()
-    val executorSparkConf = driverSpec.driverSparkConf.clone()
+    val driverSparkConfWithExecutorSetup = driverSpec.driverSparkConf.clone()
       .set(HADOOP_CONFIG_MAP_SPARK_CONF_NAME, hadoopConfigMapName)
       .setAll(currentHadoopSpec.additionalDriverSparkConf)
     driverSpec.copy(
       driverPod = currentHadoopSpec.driverPod,
       driverContainer = currentHadoopSpec.driverContainer,
-      driverSparkConf = executorSparkConf,
+      driverSparkConf = driverSparkConfWithExecutorSetup,
       otherKubernetesResources =
         driverSpec.otherKubernetesResources ++
         Seq(configMap) ++ currentHadoopSpec.dtSecret.toSeq