Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.

Commit 0935968

Browse files
committed
modified otherKubernetesResource logic
1 parent 9ec1e6b commit 0935968

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ private[spark] class HadoopConfigBootstrapStep(
5454
driverPod = currentHadoopSpec.driverPod,
5555
driverContainer = currentHadoopSpec.driverContainer,
5656
driverSparkConf = executorSparkConf,
57-
otherKubernetesResources = Seq(configMap)
57+
otherKubernetesResources =
58+
driverSpec.otherKubernetesResources ++
59+
Seq(configMap)
5860
)
5961
}
6062
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.apache.spark.deploy.kubernetes.submit.submitsteps.hadoopsteps
1818

1919
import java.io.File
20+
import org.apache.commons.io.FileUtils.readFileToString
2021

2122
import org.apache.spark.deploy.kubernetes.{HadoopConfBootstrap, PodWithMainContainer}
2223

@@ -41,7 +42,7 @@ private[spark] class HadoopConfMounterStep(
4142
driverContainer = bootstrappedPodAndMainContainer.mainContainer,
4243
configMapProperties =
4344
hadoopConfigurationFiles.map(file =>
44-
(file.toPath.getFileName.toString, file.toString)).toMap
45+
(file.toPath.getFileName.toString, readFileToString(file))).toMap
4546
)
4647
}
4748
}

0 commit comments

Comments
 (0)