Skip to content

[SPARK-50776][K8S][TESTS] Fix test assertions on executor service account #49428

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
cnauroth wants to merge 1 commit into from
Closed

[SPARK-50776][K8S][TESTS] Fix test assertions on executor service account #49428

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
58 changes: 21 additions & 37 deletions .../org/apache/spark/deploy/k8s/features/ExecutorKubernetesCredentialsFeatureStepSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ package org.apache.spark.deploy.k8s.features

import org.scalatest.BeforeAndAfter

import io.fabric8.kubernetes.api.model.PodSpec

import org.apache.spark.{SparkConf, SparkFunSuite}
import org.apache.spark.deploy.k8s.{KubernetesExecutorConf, KubernetesTestConf, SparkPod}
import org.apache.spark.deploy.k8s.{KubernetesTestConf, SparkPod}
import org.apache.spark.deploy.k8s.Config._

class ExecutorKubernetesCredentialsFeatureStepSuite extends SparkFunSuite with BeforeAndAfter {
Expand All @@ -30,58 +32,40 @@ class ExecutorKubernetesCredentialsFeatureStepSuite extends SparkFunSuite with B
baseConf = new SparkConf(false)
}

private def newExecutorConf(environment: Map[String, String] = Map.empty):
KubernetesExecutorConf = {
KubernetesTestConf.createExecutorConf(
sparkConf = baseConf,
environment = environment)
}

test("configure spark pod with executor service account") {
baseConf.set(KUBERNETES_EXECUTOR_SERVICE_ACCOUNT_NAME, "executor-name")
val step = new ExecutorKubernetesCredentialsFeatureStep(newExecutorConf())
val spec = step
.configurePod(SparkPod.initialPod())
.pod
.getSpec

val serviceAccountName = spec.getServiceAccountName
val accountName = spec.getServiceAccount
assertSAName(serviceAccountName, accountName)
val spec = evaluateStep()
assertSAName("executor-name", spec)
}

test("configure spark pod with with driver service account " +
"and without executor service account") {
baseConf.set(KUBERNETES_DRIVER_SERVICE_ACCOUNT_NAME, "driver-name")
val step = new ExecutorKubernetesCredentialsFeatureStep(newExecutorConf())
val spec = step
.configurePod(SparkPod.initialPod())
.pod
.getSpec

val serviceAccountName = spec.getServiceAccountName
val accountName = spec.getServiceAccount
assertSAName(serviceAccountName, accountName)
val spec = evaluateStep()
assertSAName("driver-name", spec)
}

test("configure spark pod with with driver service account " +
"and with executor service account") {
baseConf.set(KUBERNETES_DRIVER_SERVICE_ACCOUNT_NAME, "driver-name")
baseConf.set(KUBERNETES_EXECUTOR_SERVICE_ACCOUNT_NAME, "executor-name")
val spec = evaluateStep()
assertSAName("executor-name", spec)
}

private def assertSAName(expectedServiceAccountName: String,
spec: PodSpec): Unit = {
assert(spec.getServiceAccountName.equals(expectedServiceAccountName))
assert(spec.getServiceAccount.equals(expectedServiceAccountName))
}

val step = new ExecutorKubernetesCredentialsFeatureStep(newExecutorConf())
val spec = step
private def evaluateStep(): PodSpec = {
val executorConf = KubernetesTestConf.createExecutorConf(
sparkConf = baseConf)
val step = new ExecutorKubernetesCredentialsFeatureStep(executorConf)
step
.configurePod(SparkPod.initialPod())
.pod
.getSpec

val serviceAccountName = spec.getServiceAccountName
val accountName = spec.getServiceAccount
assertSAName(serviceAccountName, accountName)
}

def assertSAName(serviceAccountName: String, accountName: String): Unit = {
assert(serviceAccountName.equals(serviceAccountName))
assert(accountName.equals(accountName))
}
}
Loading