Skip to content

[SPARK-43171][K8S] Support custom Unix username in Pod #40831

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
pan3793 wants to merge 5 commits into from
Closed

[SPARK-43171][K8S] Support custom Unix username in Pod #40831

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20f1aff
[SPARK-43171][K8S] Support dynamic changing unix user in Pod
pan3793 Apr 18, 2023
bec5f3f
IT
pan3793 Apr 28, 2023
049a984
Revert "IT"
pan3793 Apr 28, 2023
6fecd5c
IT 2
pan3793 Apr 28, 2023
3ee42bb
nit
pan3793 Apr 28, 2023
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
Revert "IT" 
This reverts commit bec5f3f.
  • Loading branch information
@pan3793
pan3793 committed Apr 28, 2023
commit 049a9840d73c75fa2f66457dd3a755ed5d4f1551
26 changes: 2 additions & 24 deletions ...ion-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/DepsTestsSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import org.scalatest.time.{Minutes, Span}

import org.apache.spark.SparkException
import org.apache.spark.deploy.k8s.integrationtest.DepsTestsSuite.{DEPS_TIMEOUT, FILE_CONTENTS, HOST_PATH}
import org.apache.spark.deploy.k8s.integrationtest.KubernetesSuite.{usernameTestTag, INTERVAL, MinikubeTag, SPARK_PI_MAIN_CLASS, TIMEOUT}
import org.apache.spark.deploy.k8s.integrationtest.KubernetesSuite.{INTERVAL, MinikubeTag, SPARK_PI_MAIN_CLASS, TIMEOUT}
import org.apache.spark.deploy.k8s.integrationtest.Utils.getExamplesJarName
import org.apache.spark.deploy.k8s.integrationtest.backend.minikube.Minikube
import org.apache.spark.internal.config.{ARCHIVES, PYSPARK_DRIVER_PYTHON, PYSPARK_PYTHON}
Expand Down Expand Up @@ -269,36 +269,15 @@ private[spark] trait DepsTestsSuite { k8sSuite: KubernetesSuite =>
"Python runtime version check is: True",
"Python environment version check is: True",
"Python runtime version check for executor is: True"),
depsFile = Some(outDepsFile))
Some(outDepsFile))
} finally {
Files.delete(new File(outDepsFile).toPath)
}
}

test("SPARK-43171: Support custom Unix username in Pod",
k8sTestTag, usernameTestTag, MinikubeTag) {
val fileName = Utils.createTempFile(
"""#!/usr/bin/env bash
|export IS_CUSTOM_PYTHON=1
|echo "login user is `id -un`"
|python3 "$@"
""".stripMargin, HOST_PATH)
Utils.createTarGzFile(s"$HOST_PATH/$fileName", s"$HOST_PATH/$fileName.tgz")
sparkAppConf
.set(ARCHIVES.key, s"$HOST_PATH/$fileName.tgz#test_env")
.set(PYSPARK_PYTHON.key, s"./test_env/$fileName")
.set("spark.kubernetes.driverEnv.SPARK_USER_NAME", "spark-kube")
.set("spark.executorEnv.SPARK_USER_NAME", "spark-kube")
val pySparkFiles = Utils.getTestFileAbsolutePath("python_executable_check.py", sparkHomeDir)
testPython(pySparkFiles,
expectedDriverLogs = Seq("login user is spark-kube"),
expectedExecutorLogs = Seq("login user is spark-kube"))
}

private def testPython(
pySparkFiles: String,
expectedDriverLogs: Seq[String],
expectedExecutorLogs: Seq[String] = Seq.empty,
depsFile: Option[String] = None,
env: Map[String, String] = Map.empty[String, String]): Unit = {
tryDepsTest {
Expand All @@ -307,7 +286,6 @@ private[spark] trait DepsTestsSuite { k8sSuite: KubernetesSuite =>
appResource = pySparkFiles,
mainClass = "",
expectedDriverLogOnCompletion = expectedDriverLogs,
expectedExecutorLogOnCompletion = expectedExecutorLogs,
appArgs = Array("python3"),
driverPodChecker = doBasicDriverPyPodCheck,
executorPodChecker = doBasicExecutorPyPodCheck,
Expand Down
1 change: 0 additions & 1 deletion ...on-tests/src/test/scala/org/apache/spark/deploy/k8s/integrationtest/KubernetesSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,6 @@ class KubernetesSuite extends SparkFunSuite

private[spark] object KubernetesSuite {
val k8sTestTag = Tag("k8s")
val usernameTestTag = Tag("username")
val localTestTag = Tag("local")
val schedulingTestTag = Tag("schedule")
val decomTestTag = Tag("decom")
Expand Down