Skip to content

[SPARK-59702][K8S][4.X] Use KeyToPathBuilder instead of KeyToPath constructor #58954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dongjoon-hyun wants to merge 1 commit into from
+11 −5
Closed

[SPARK-59702][K8S][4.X] Use KeyToPathBuilder instead of KeyToPath constructor #58954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions ...rnetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/KubernetesClientUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import scala.collection.mutable
import scala.io.{Codec, Source}
import scala.jdk.CollectionConverters._

import io.fabric8.kubernetes.api.model.{ConfigMap, ConfigMapBuilder, KeyToPath}
import io.fabric8.kubernetes.api.model.{ConfigMap, ConfigMapBuilder, KeyToPath, KeyToPathBuilder}

import org.apache.spark.SparkConf
import org.apache.spark.annotation.{DeveloperApi, Since, Stable}
Expand Down Expand Up @@ -113,7 +113,11 @@ object KubernetesClientUtils extends Logging {
confFilesMap.map {
case (fileName: String, _: String) =>
val filePermissionMode = 420 // 420 is decimal for octal literal 0644.
new KeyToPath(fileName, filePermissionMode, fileName)
new KeyToPathBuilder()
.withKey(fileName)
.withMode(filePermissionMode)
.withPath(fileName)
.build()
}.toList.sortBy(x => x.getKey) // List is sorted to make mocking based tests work
}

Expand Down
8 changes: 5 additions & 3 deletions ...agers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/submit/ClientSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,10 @@ class ClientSuite extends SparkFunSuite with BeforeAndAfter {
.endVolumeMount()
.build()

private val KEY_TO_PATH =
new KeyToPath(SPARK_CONF_FILE_NAME, 420, SPARK_CONF_FILE_NAME)
private def keyToPath(key: String): KeyToPath =
new KeyToPathBuilder().withKey(key).withMode(420).withPath(key).build()

private val KEY_TO_PATH = keyToPath(SPARK_CONF_FILE_NAME)

private def fullExpectedPod(keyToPaths: List[KeyToPath] = List(KEY_TO_PATH)) =
new PodBuilder(BUILT_DRIVER_POD)
Expand Down Expand Up @@ -306,7 +308,7 @@ class ClientSuite extends SparkFunSuite with BeforeAndAfter {

val (sparkConf: SparkConf, expectedConfFiles: Seq[String]) = testSetup

val expectedKeyToPaths = (expectedConfFiles.map(x => new KeyToPath(x, 420, x)).toList ++
val expectedKeyToPaths = (expectedConfFiles.map(keyToPath).toList ++
List(KEY_TO_PATH)).sortBy(x => x.getKey)

when(podsWithNamespace.resource(fullExpectedPod(expectedKeyToPaths)))
Expand Down