Skip to content

[SPARK-56736][K8S] Add sparkVersion method to KubernetesConf abstract class #55697

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
Closed

[SPARK-56736][K8S] Add sparkVersion method to KubernetesConf abstract class #55697

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
6 changes: 4 additions & 2 deletions ...-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/KubernetesConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ private[spark] abstract class KubernetesConf(val sparkConf: SparkConf) {

def appName: String = get("spark.app.name", "spark")

def sparkVersion: String = SPARK_VERSION

def namespace: String = get(KUBERNETES_NAMESPACE)

def imagePullPolicy: String = get(CONTAINER_IMAGE_PULL_POLICY)
Expand Down Expand Up @@ -122,7 +124,7 @@ class KubernetesDriverConf(

override def labels: Map[String, String] = {
val presetLabels = Map(
SPARK_VERSION_LABEL -> SPARK_VERSION,
SPARK_VERSION_LABEL -> sparkVersion,
SPARK_APP_ID_LABEL -> appId,
SPARK_APP_NAME_LABEL -> KubernetesConf.getAppNameLabel(appName),
SPARK_ROLE_LABEL -> SPARK_POD_DRIVER_ROLE)
Expand Down Expand Up @@ -199,7 +201,7 @@ private[spark] class KubernetesExecutorConf(

override def labels: Map[String, String] = {
val presetLabels = Map(
SPARK_VERSION_LABEL -> SPARK_VERSION,
SPARK_VERSION_LABEL -> sparkVersion,
SPARK_EXECUTOR_ID_LABEL -> executorId,
SPARK_APP_ID_LABEL -> appId,
SPARK_APP_NAME_LABEL -> KubernetesConf.getAppNameLabel(appName),
Expand Down
25 changes: 25 additions & 0 deletions ...gers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/KubernetesConfSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,31 @@ class KubernetesConfSuite extends SparkFunSuite {
}
}

test("SPARK-56736: sparkVersion returns the runtime Spark version for driver and executor") {
val sparkConf = new SparkConf(false)
val driverConf = KubernetesTestConf.createDriverConf(sparkConf)
val execConf = KubernetesTestConf.createExecutorConf(sparkConf)
assert(driverConf.sparkVersion === SPARK_VERSION)
assert(execConf.sparkVersion === SPARK_VERSION)
assert(driverConf.labels(SPARK_VERSION_LABEL) === SPARK_VERSION)
assert(execConf.labels(SPARK_VERSION_LABEL) === SPARK_VERSION)
}

test("SPARK-56736: KubernetesDriverConf subclass can override sparkVersion") {
val customVersion = "9.9.9-custom"
val customConf = new KubernetesDriverConf(
new SparkConf(false),
KubernetesTestConf.APP_ID,
JavaMainAppResource(None),
KubernetesTestConf.MAIN_CLASS,
APP_ARGS,
None) {
override def sparkVersion: String = customVersion
}
assert(customConf.sparkVersion === customVersion)
assert(customConf.labels(SPARK_VERSION_LABEL) === customVersion)
}

test("SPARK-52902: K8s image configs support {{SPARK_VERSION}} placeholder") {
val sparkConf = new SparkConf(false)
sparkConf.set(CONTAINER_IMAGE, "apache/spark:{{SPARK_VERSION}}")
Expand Down