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

Commit 9ec1e6b

Browse files
committed
styling
1 parent 495f8f8 commit 9ec1e6b

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ private[spark] class DriverConfigurationStepsOrchestrator(
107107
} else {
108108
val hadoopStepsOrchestrator = new HadoopStepsOrchestrator(
109109
namespace,
110-
kubernetesResourceNamePrefix,
110+
hadoopConfigMapName,
111111
submissionSparkConf,
112112
hadoopConfigurations)
113113
val hadoopConfSteps =
114114
hadoopStepsOrchestrator.getHadoopSteps()
115-
Some(new HadoopConfigBootstrapStep(hadoopConfSteps, kubernetesResourceNamePrefix))
115+
Some(new HadoopConfigBootstrapStep(hadoopConfSteps, hadoopConfigMapName))
116116
}
117117
val pythonStep = mainAppResource match {
118118
case PythonMainAppResource(mainPyResource) =>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,17 @@ import java.io.StringWriter
2020
import java.util.Properties
2121

2222
import io.fabric8.kubernetes.api.model.{ConfigMap, ConfigMapBuilder, HasMetadata}
23+
2324
import org.apache.spark.deploy.kubernetes.constants._
2425
import org.apache.spark.deploy.kubernetes.submit.submitsteps.hadoopsteps.{HadoopConfigSpec, HadoopConfigurationStep}
2526

2627
/**
2728
* Configures the driverSpec that bootstraps dependencies into the driver pod.
2829
*/
2930
private[spark] class HadoopConfigBootstrapStep(
30-
hadoopConfigurationSteps: Seq[HadoopConfigurationStep], kubernetesResourceNamePrefix: String)
31+
hadoopConfigurationSteps: Seq[HadoopConfigurationStep],
32+
hadoopConfigMapName: String )
3133
extends DriverConfigurationStep {
32-
private val hadoopConfigMapName = s"$kubernetesResourceNamePrefix-hadoop-config"
3334

3435
override def configureDriver(driverSpec: KubernetesDriverSpec): KubernetesDriverSpec = {
3536
import scala.collection.JavaConverters._

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,9 @@ import org.apache.spark.deploy.kubernetes.config._
2828
*/
2929
private[spark] class HadoopStepsOrchestrator(
3030
namespace: String,
31-
kubernetesResourceNamePrefix: String,
31+
hadoopConfigMapName: String,
3232
submissionSparkConf: SparkConf,
3333
hadoopConfigurationFiles: Array[File]) {
34-
private val hadoopConfigMapName = s"$kubernetesResourceNamePrefix-hadoop-config"
3534
private val maybeKerberosSupport = submissionSparkConf.get(KUBERNETES_KERBEROS_SUPPORT)
3635

3736
def getHadoopSteps(): Seq[HadoopConfigurationStep] = {

0 commit comments

Comments
 (0)