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

Commit aa04b04

Browse files
committed
Document the experimental config option
1 parent f2a4033 commit aa04b04

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,17 @@ package object config extends Logging {
6969
private[spark] val CLIENT_CERT_FILE_CONF_SUFFIX = "clientCertFile"
7070
private[spark] val CA_CERT_FILE_CONF_SUFFIX = "caCertFile"
7171

72-
private[spark] val MOUNTED_HADOOP_SECRET_CONF = "spark.kubernetes.mounted.hadoopSecret"
72+
// TODO: This option is intended to be used for internal prototype only until the submission
73+
// client automatically creates the secret file. Remove this option afterward
74+
// unless other use is found.
75+
private[spark] val MOUNTED_HADOOP_SECRET_CONF =
76+
ConfigBuilder("spark.kubernetes.mounted.hadoopSecret")
77+
.doc("Use a Kubernetes secret containing Hadoop tokens such as an HDFS delegation token." +
78+
" The secret should have an entry named 'hadoop-token-file' under the data section," +
79+
" which contains binary dumps of Hadoop tokens.")
80+
.internal()
81+
.stringConf
82+
.createOptional
7383

7484
private[spark] val RESOURCE_STAGING_SERVER_USE_SERVICE_ACCOUNT_CREDENTIALS =
7585
ConfigBuilder(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.apache.spark.deploy.kubernetes.submit.HadoopSecretUtil
2323
private[spark] class DriverHadoopCredentialsStep(submissionSparkConf: SparkConf)
2424
extends DriverConfigurationStep {
2525

26-
private val maybeMountedHadoopSecret = submissionSparkConf.getOption(MOUNTED_HADOOP_SECRET_CONF)
26+
private val maybeMountedHadoopSecret = submissionSparkConf.get(MOUNTED_HADOOP_SECRET_CONF)
2727

2828
override def configureDriver(driverSpec: KubernetesDriverSpec): KubernetesDriverSpec = {
2929
val podWithMountedHadoopToken = HadoopSecretUtil.configurePod(maybeMountedHadoopSecret,

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/kubernetes/KubernetesClusterSchedulerBackend.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ private[spark] class KubernetesClusterSchedulerBackend(
130130
private implicit val requestExecutorContext = ExecutionContext.fromExecutorService(
131131
ThreadUtils.newDaemonCachedThreadPool("kubernetes-executor-requests"))
132132

133-
private val maybeMountedHadoopSecret = conf.getOption(MOUNTED_HADOOP_SECRET_CONF)
133+
private val maybeMountedHadoopSecret = conf.get(MOUNTED_HADOOP_SECRET_CONF)
134134

135135
private val driverPod = try {
136136
kubernetesClient.pods().inNamespace(kubernetesNamespace).

0 commit comments

Comments
 (0)