Skip to content

Commit 1fa2a9a

Browse files
committed
style, test compile
1 parent 5a14d01 commit 1fa2a9a

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

resource-managers/kubernetes/core/src/main/scala/org/apache/spark/deploy/k8s/submit/KubernetesDriverBuilder.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import java.io.File
2121
import io.fabric8.kubernetes.client.KubernetesClient
2222

2323
import org.apache.spark.{SparkConf, SparkException}
24-
import org.apache.spark.util.Utils
2524
import org.apache.spark.deploy.k8s._
2625
import org.apache.spark.deploy.k8s.features._
27-
import org.apache.spark.deploy.k8s.features.bindings.{JavaDriverFeatureStep, PythonDriverFeatureStep, RDriverFeatureStep}
26+
import org.apache.spark.deploy.k8s.features.bindings.{JavaDriverFeatureStep, PythonDriverFeatureStep}
2827
import org.apache.spark.internal.Logging
28+
import org.apache.spark.util.Utils
2929

3030
private[spark] class KubernetesDriverBuilder(
3131
provideBasicStep: (KubernetesConf[KubernetesDriverSpecificConf]) => BasicDriverFeatureStep =

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ class PodTemplateConfigMapStepSuite extends SparkFunSuite with BeforeAndAfter {
4242
Seq.empty),
4343
"resource",
4444
"app-id",
45+
None,
4546
Map.empty,
4647
Map.empty,
4748
Map.empty,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,18 @@ import java.io.File
2020

2121
import com.google.common.base.Charsets
2222
import com.google.common.io.Files
23-
24-
import org.mockito.Mockito
25-
2623
import io.fabric8.kubernetes.api.model.{DoneablePod, Pod, PodBuilder, PodList}
2724
import io.fabric8.kubernetes.client.KubernetesClient
2825
import io.fabric8.kubernetes.client.dsl.{MixedOperation, PodResource}
2926
import org.mockito.Matchers._
27+
import org.mockito.Mockito
3028
import org.mockito.Mockito._
3129

3230
import org.apache.spark.{SparkConf, SparkException, SparkFunSuite}
3331
import org.apache.spark.deploy.k8s._
3432
import org.apache.spark.deploy.k8s.Config.{CONTAINER_IMAGE, KUBERNETES_DRIVER_PODTEMPLATE_FILE, KUBERNETES_EXECUTOR_PODTEMPLATE_FILE}
3533
import org.apache.spark.deploy.k8s.features.{BasicDriverFeatureStep, DriverKubernetesCredentialsFeatureStep, DriverServiceFeatureStep, EnvSecretsFeatureStep, KubernetesFeaturesTestUtils, LocalDirsFeatureStep, MountSecretsFeatureStep, _}
36-
import org.apache.spark.deploy.k8s.features.bindings.{JavaDriverFeatureStep, PythonDriverFeatureStep, RDriverFeatureStep}
34+
import org.apache.spark.deploy.k8s.features.bindings.{JavaDriverFeatureStep, PythonDriverFeatureStep}
3735
import org.apache.spark.util.Utils
3836

3937
class KubernetesDriverBuilderSuite extends SparkFunSuite {
@@ -291,6 +289,7 @@ class KubernetesDriverBuilderSuite extends SparkFunSuite {
291289
Seq.empty),
292290
"prefix",
293291
"appId",
292+
None,
294293
Map.empty,
295294
Map.empty,
296295
Map.empty,
@@ -377,6 +376,7 @@ class KubernetesDriverBuilderSuite extends SparkFunSuite {
377376
Seq.empty),
378377
"prefix",
379378
"appId",
379+
None,
380380
Map.empty,
381381
Map.empty,
382382
Map.empty,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ class KubernetesExecutorBuilderSuite extends SparkFunSuite {
219219
.build())),
220220
"prefix",
221221
"appId",
222+
None,
222223
Map.empty,
223224
Map.empty,
224225
Map.empty,

0 commit comments

Comments
 (0)