Skip to content

Commit 3ab7229

Browse files
committed
k8s tests, style
1 parent 490f0a5 commit 3ab7229

File tree

5 files changed

+9
-1
lines changed

5 files changed

+9
-1
lines changed

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/KubernetesExecutorBuilder.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ private[spark] class KubernetesExecutorBuilder(
5656
Seq(provideMountLocalFilesStep(kubernetesConf))
5757
} else Nil
5858

59-
val allFeatures = baseFeatures ++ secretFeature ++ secretEnvFeature ++ volumesFeature ++ localFilesFeature
59+
val allFeatures = baseFeatures ++
60+
secretFeature ++ secretEnvFeature ++ volumesFeature ++ localFilesFeature
6061

6162
var executorPod = SparkPod.initialPod()
6263
for (feature <- allFeatures) {

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/features/MountLocalFilesFeatureStepSuite.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class MountLocalFilesFeatureStepSuite extends SparkFunSuite with BeforeAndAfter
6464
Map.empty,
6565
Map.empty,
6666
Map.empty,
67+
Seq.empty,
6768
sparkFiles)
6869
stepUnderTest = new MountLocalFilesFeatureStep(kubernetesConf)
6970
}

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/features/MountVolumesFeatureStepSuite.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ class MountVolumesFeatureStepSuite extends SparkFunSuite {
3030
Seq.empty),
3131
appResourceNamePrefix = "resource",
3232
appId = "app-id",
33+
mountLocalFilesSecretName = None,
3334
roleLabels = Map.empty,
3435
roleAnnotations = Map.empty,
3536
roleSecretNamesToMountPaths = Map.empty,

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/deploy/k8s/submit/KubernetesDriverBuilderSuite.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ class KubernetesDriverBuilderSuite extends SparkFunSuite {
218218
Map.empty,
219219
Map.empty,
220220
Map.empty,
221+
Seq.empty,
221222
allFiles)
222223
validateStepTypesApplied(
223224
builderUnderTest.buildFromFeatures(conf),
@@ -244,6 +245,7 @@ class KubernetesDriverBuilderSuite extends SparkFunSuite {
244245
Seq.empty),
245246
"prefix",
246247
"appId",
248+
Some("secret"),
247249
Map.empty,
248250
Map.empty,
249251
Map.empty,

resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/KubernetesExecutorBuilderSuite.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ class KubernetesExecutorBuilderSuite extends SparkFunSuite {
106106
Map.empty,
107107
Map.empty,
108108
Map.empty,
109+
Seq.empty,
109110
Seq.empty[String])
110111
validateStepTypesApplied(
111112
builderUnderTest.buildFromFeatures(conf),
@@ -126,6 +127,7 @@ class KubernetesExecutorBuilderSuite extends SparkFunSuite {
126127
"executor-id", new PodBuilder().build()),
127128
"prefix",
128129
"appId",
130+
Some("secret"),
129131
Map.empty,
130132
Map.empty,
131133
Map.empty,
@@ -137,6 +139,7 @@ class KubernetesExecutorBuilderSuite extends SparkFunSuite {
137139
builderUnderTest.buildFromFeatures(conf),
138140
BASIC_STEP_TYPE,
139141
LOCAL_DIRS_STEP_TYPE,
142+
MOUNT_LOCAL_FILES_STEP_TYPE,
140143
MOUNT_VOLUMES_STEP_TYPE)
141144
}
142145

0 commit comments

Comments
 (0)