Skip to content

[SPARK-36566][K8S] Add Spark appname as a label to pods #34460

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
Yikun wants to merge 4 commits into from
Closed

[SPARK-36566][K8S] Add Spark appname as a label to pods #34460

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca0ecce
Add Spark appname as a label to pods
Yikun Nov 1, 2021
e7e127a
Append SPARK_APP_NAME_LABEL to conf.labels
Yikun Nov 2, 2021
69fe632
reformat
Yikun Nov 2, 2021
61c462c
Label lenth limit
Yikun Nov 2, 2021
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
1 change: 1 addition & 0 deletions resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/Constants.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ private[spark] object Constants {

// Labels
val SPARK_APP_ID_LABEL = "spark-app-selector"
val SPARK_APP_NAME_LABEL = "spark-app-name"
val SPARK_EXECUTOR_ID_LABEL = "spark-exec-id"
val SPARK_RESOURCE_PROFILE_ID_LABEL = "spark-exec-resourceprofile-id"
val SPARK_ROLE_LABEL = "spark-role"
Expand Down
1 change: 1 addition & 0 deletions ...tes/core/src/main/scala/org/apache/spark/deploy/k8s/features/BasicDriverFeatureStep.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ private[spark] class BasicDriverFeatureStep(conf: KubernetesDriverConf)
.editOrNewMetadata()
.withName(driverPodName)
.addToLabels(conf.labels.asJava)
.addToLabels(SPARK_APP_NAME_LABEL, conf.appName)
.addToAnnotations(conf.annotations.asJava)
.endMetadata()
.editOrNewSpec()
Expand Down
1 change: 1 addition & 0 deletions ...s/core/src/main/scala/org/apache/spark/deploy/k8s/features/BasicExecutorFeatureStep.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ private[spark] class BasicExecutorFeatureStep(
.withName(name)
.addToLabels(kubernetesConf.labels.asJava)
.addToLabels(SPARK_RESOURCE_PROFILE_ID_LABEL, resourceProfile.id.toString)
.addToLabels(SPARK_APP_NAME_LABEL, kubernetesConf.appName)
.addToAnnotations(kubernetesConf.annotations.asJava)
.addToOwnerReferences(ownerReference.toSeq: _*)
.endMetadata()
Expand Down
3 changes: 2 additions & 1 deletion ...ore/src/test/scala/org/apache/spark/deploy/k8s/features/BasicDriverFeatureStepSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ class BasicDriverFeatureStepSuite extends SparkFunSuite {

val driverPodMetadata = configuredPod.pod.getMetadata
assert(driverPodMetadata.getName === "spark-driver-pod")
DRIVER_LABELS.foreach { case (k, v) =>
val DEFAULT_LABELS = Map(SPARK_APP_NAME_LABEL-> kubernetesConf.appName)
(DRIVER_LABELS ++ DEFAULT_LABELS).foreach { case (k, v) =>
assert(driverPodMetadata.getLabels.get(k) === v)
}
assert(driverPodMetadata.getAnnotations.asScala === DRIVER_ANNOTATIONS)
Expand Down
6 changes: 4 additions & 2 deletions ...e/src/test/scala/org/apache/spark/deploy/k8s/features/BasicExecutorFeatureStepSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,15 @@ class BasicExecutorFeatureStepSuite extends SparkFunSuite with BeforeAndAfter {
}

test("basic executor pod has reasonable defaults") {
val step = new BasicExecutorFeatureStep(newExecutorConf(), new SecurityManager(baseConf),
val conf = newExecutorConf()
val step = new BasicExecutorFeatureStep(conf, new SecurityManager(baseConf),
defaultProfile)
val executor = step.configurePod(SparkPod.initialPod())

// The executor pod name and default labels.
assert(executor.pod.getMetadata.getName === s"$RESOURCE_NAME_PREFIX-exec-1")
LABELS.foreach { case (k, v) =>
val DEFAULT_LABELS = Map(SPARK_APP_NAME_LABEL-> conf.appName)
(LABELS ++ DEFAULT_LABELS).foreach { case (k, v) =>
assert(executor.pod.getMetadata.getLabels.get(k) === v)
}
assert(executor.pod.getSpec.getImagePullSecrets.asScala === TEST_IMAGE_PULL_SECRET_OBJECTS)
Expand Down