Skip to content
This repository was archived by the owner on Jan 9, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@ object BuildCommons {
).map(ProjectRef(buildLocation, _)) ++ sqlProjects ++ streamingProjects

val optionallyEnabledProjects@Seq(mesos, yarn, java8Tests, sparkGangliaLgpl,
streamingKinesisAsl, dockerIntegrationTests) =
Seq("mesos", "yarn", "java8-tests", "ganglia-lgpl", "streaming-kinesis-asl",
"docker-integration-tests").map(ProjectRef(buildLocation, _))
streamingKinesisAsl, dockerIntegrationTests, kubernetes, _*) =
Seq("mesos", "yarn", "java8-tests", "ganglia-lgpl", "streaming-kinesis-asl", "docker-integration-tests",
"kubernetes", "kubernetes-integration-tests", "kubernetes-integration-tests-spark-jobs",
"kubernetes-integration-tests-spark-jobs-helpers", "kubernetes-docker-minimal-bundle"
).map(ProjectRef(buildLocation, _))

val assemblyProjects@Seq(networkYarn, streamingFlumeAssembly, streamingKafkaAssembly, streamingKafka010Assembly, streamingKinesisAslAssembly) =
Seq("network-yarn", "streaming-flume-assembly", "streaming-kafka-0-8-assembly", "streaming-kafka-0-10-assembly", "streaming-kinesis-asl-assembly")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package org.apache.spark.deploy.kubernetes
import java.io.{File, FileOutputStream, OutputStreamWriter}
import java.math.BigInteger
import java.nio.file.Files
import java.security.cert.X509Certificate
import java.security.{KeyPair, KeyPairGenerator, KeyStore, SecureRandom}
import java.security.cert.X509Certificate
import java.util.{Calendar, Random}
import javax.security.auth.x500.X500Principal

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import io.fabric8.kubernetes.api.model.{ConfigMap, ConfigMapBuilder, Container,
import io.fabric8.kubernetes.client.KubernetesClient
import io.fabric8.kubernetes.client.dsl.{MixedOperation, NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable, PodResource}
import org.hamcrest.{BaseMatcher, Description}
import org.mockito.Matchers.{any, anyVararg, argThat, startsWith, eq => mockitoEq}
import org.mockito.Matchers.{any, anyVararg, argThat, eq => mockitoEq, startsWith}
import org.mockito.Mockito.when
import org.mockito.invocation.InvocationOnMock
import org.mockito.stubbing.Answer
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ class ResourceStagingServerSslOptionsProviderSuite extends SparkFunSuite with Be
.set("spark.ssl.kubernetes.resourceStagingServer.keyStore", keyStoreFile.getAbsolutePath)
.set("spark.ssl.kubernetes.resourceStagingServer.keyStorePasswordFile",
keyStorePasswordFile.getAbsolutePath)
.set("spark.ssl.kubernetes.resourceStagingServer.keyPasswordFile", keyPasswordFile.getAbsolutePath)
.set("spark.ssl.kubernetes.resourceStagingServer.keyPasswordFile",
keyPasswordFile.getAbsolutePath)
val sslOptions = sslOptionsProvider.getSslOptions
assert(sslOptions.keyStorePassword === Some("keyStorePassword"),
"Incorrect keyStore password or it was not set.")
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/docker-minimal-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<packaging>pom</packaging>

<properties>
<sbt.project.name>docker-minimal-bundle</sbt.project.name>
<sbt.project.name>kubernetes-docker-minimal-bundle</sbt.project.name>
<build.testJarPhase>none</build.testJarPhase>
<build.copyDependenciesPhase>pre-integration-test</build.copyDependenciesPhase>
</properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
<artifactId>spark-kubernetes-integration-tests-spark-jobs-helpers_2.11</artifactId>
<packaging>jar</packaging>
<name>Spark Project Kubernetes Integration Tests Spark Jobs Helpers</name>
<properties>
<sbt.project.name>kubernetes-integration-tests-spark-jobs-helpers</sbt.project.name>
</properties>

<dependencies>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
<artifactId>spark-kubernetes-integration-tests-spark-jobs_2.11</artifactId>
<packaging>jar</packaging>
<name>Spark Project Kubernetes Integration Tests Spark Jobs</name>
<properties>
<sbt.project.name>kubernetes-integration-tests-spark-jobs</sbt.project.name>
</properties>

<dependencies>
<dependency>
Expand Down
3 changes: 3 additions & 0 deletions resource-managers/kubernetes/integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
</parent>

<artifactId>spark-kubernetes-integration-tests_2.11</artifactId>
<properties>
<sbt.project.name>kubernetes-integration-tests</sbt.project.name>
</properties>
<packaging>jar</packaging>
<name>Spark Project Kubernetes Integration Tests</name>

Expand Down