Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Addressed first round of comments
  • Loading branch information
liyinan926 committed Dec 23, 2017
commit 5d2cbc8c142a25febab8f475ff0eca5db2919403
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private[spark] class InitContainerBootstrapImpl(
.build())

val initContainer = new ContainerBuilder(podWithDetachedInitContainer.initContainer)
.withName(s"spark-init")
.withName("spark-init")
.withImage(initContainerImage)
.withImagePullPolicy(dockerImagePullPolicy)
.addAllToEnv(initContainerCustomEnvVars.asJava)
Expand Down Expand Up @@ -124,5 +124,4 @@ private[spark] class InitContainerBootstrapImpl(
initContainer,
mainContainerWithMountedFiles)
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ private[spark] class KubernetesSparkDependencyDownloadInitContainer(
remoteJars,
jarsDownloadDir,
s"Remote jars download directory specified at $jarsDownloadDir does not exist " +
s"or is not a directory.")
"or is not a directory.")
}
val remoteFilesDownload = Future[Unit] {
logInfo(s"Downloading remote files: $remoteFiles")
downloadFiles(
remoteFiles,
filesDownloadDir,
s"Remote files download directory specified at $filesDownloadDir does not exist " +
s"or is not a directory.")
"or is not a directory.")
}
waitForFutures(
remoteJarsDownload,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ private[spark] class ExecutorPodFactoryImpl(
}.getOrElse(executorContainer)

val (withMaybeSecretsMountedPod, withMaybeSecretsMountedContainer) =
mountSecretsBootstrap.map {bootstrap =>
mountSecretsBootstrap.map { bootstrap =>
bootstrap.mountSecrets(executorPod, containerWithExecutorLimitCores)
}.getOrElse((executorPod, containerWithExecutorLimitCores))

Expand Down