Move kubernetes under resource-managers folder.

markhamstra · Jul 24, 2017 · f20397b · f20397b
1 parent f9ae918
commit f20397b
Show file tree

Hide file tree

Showing 25 changed files with 13 additions and 13 deletions.
diff --git a/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala b/core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
@@ -236,7 +236,7 @@ object SparkSubmit extends CommandLineUtils {
       case m if m.startsWith("k8s") => KUBERNETES
       case m if m.startsWith("local") => LOCAL
       case _ =>
-        printErrorAndExit("Master must either be yarn or start with spark, mesos, local")
+        printErrorAndExit("Master must either be yarn or start with spark, mesos, k8s, or local")
         -1
     }
 

diff --git a/pom.xml b/pom.xml
@@ -2575,16 +2575,16 @@
     <profile>
       <id>kubernetes</id>
       <modules>
-        <module>kubernetes/core</module>
+        <module>resource-managers/kubernetes/core</module>
       </modules>
     </profile>
 
     <profile>
       <id>kubernetes-integration-tests</id>
       <modules>
-        <module>kubernetes/docker-minimal-bundle</module>
-        <module>kubernetes/integration-tests</module>
-        <module>kubernetes/integration-tests-spark-jobs</module>
+        <module>resource-managers/kubernetes/docker-minimal-bundle</module>
+        <module>resource-managers/kubernetes/integration-tests</module>
+        <module>resource-managers/kubernetes/integration-tests-spark-jobs</module>
       </modules>  
     </profile>
 

diff --git a/kubernetes/core/pom.xml → resource-managers/kubernetes/core/pom.xml b/kubernetes/core/pom.xml → resource-managers/kubernetes/core/pom.xml
@@ -20,8 +20,8 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-kubernetes_2.11</artifactId>

diff --git a/...he.spark.scheduler.ExternalClusterManager → ...he.spark.scheduler.ExternalClusterManager b/...he.spark.scheduler.ExternalClusterManager → ...he.spark.scheduler.ExternalClusterManager
diff --git a/...ache/spark/deploy/kubernetes/Client.scala → ...ache/spark/deploy/kubernetes/Client.scala b/...ache/spark/deploy/kubernetes/Client.scala → ...ache/spark/deploy/kubernetes/Client.scala
diff --git a/.../kubernetes/KubernetesClientBuilder.scala → .../kubernetes/KubernetesClientBuilder.scala b/.../kubernetes/KubernetesClientBuilder.scala → .../kubernetes/KubernetesClientBuilder.scala
diff --git a/...pache/spark/deploy/kubernetes/Retry.scala → ...pache/spark/deploy/kubernetes/Retry.scala b/...pache/spark/deploy/kubernetes/Retry.scala → ...pache/spark/deploy/kubernetes/Retry.scala
diff --git a/...rest/KubernetesRestProtocolMessages.scala → ...rest/KubernetesRestProtocolMessages.scala b/...rest/KubernetesRestProtocolMessages.scala → ...rest/KubernetesRestProtocolMessages.scala
diff --git a/...ploy/rest/kubernetes/HttpClientUtil.scala → ...ploy/rest/kubernetes/HttpClientUtil.scala b/...ploy/rest/kubernetes/HttpClientUtil.scala → ...ploy/rest/kubernetes/HttpClientUtil.scala
diff --git a/...t/kubernetes/KubernetesSparkRestApi.scala → ...t/kubernetes/KubernetesSparkRestApi.scala b/...t/kubernetes/KubernetesSparkRestApi.scala → ...t/kubernetes/KubernetesSparkRestApi.scala
diff --git a/...ubernetes/KubernetesSparkRestServer.scala → ...ubernetes/KubernetesSparkRestServer.scala b/...ubernetes/KubernetesSparkRestServer.scala → ...ubernetes/KubernetesSparkRestServer.scala
diff --git a/...kubernetes/KubernetesClusterManager.scala → ...kubernetes/KubernetesClusterManager.scala b/...kubernetes/KubernetesClusterManager.scala → ...kubernetes/KubernetesClusterManager.scala
diff --git a/...s/KubernetesClusterSchedulerBackend.scala → ...s/KubernetesClusterSchedulerBackend.scala b/...s/KubernetesClusterSchedulerBackend.scala → ...s/KubernetesClusterSchedulerBackend.scala
diff --git a/kubernetes/docker-minimal-bundle/pom.xml → .../kubernetes/docker-minimal-bundle/pom.xml b/kubernetes/docker-minimal-bundle/pom.xml → .../kubernetes/docker-minimal-bundle/pom.xml
@@ -21,8 +21,8 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-docker-minimal-bundle_2.11</artifactId>

diff --git a/...dle/src/main/assembly/driver-assembly.xml → ...dle/src/main/assembly/driver-assembly.xml b/...dle/src/main/assembly/driver-assembly.xml → ...dle/src/main/assembly/driver-assembly.xml
diff --git a/...e/src/main/assembly/executor-assembly.xml → ...e/src/main/assembly/executor-assembly.xml b/...e/src/main/assembly/executor-assembly.xml → ...e/src/main/assembly/executor-assembly.xml
diff --git a/...-bundle/src/main/docker/driver/Dockerfile → ...-bundle/src/main/docker/driver/Dockerfile b/...-bundle/src/main/docker/driver/Dockerfile → ...-bundle/src/main/docker/driver/Dockerfile
diff --git a/...undle/src/main/docker/executor/Dockerfile → ...undle/src/main/docker/executor/Dockerfile b/...undle/src/main/docker/executor/Dockerfile → ...undle/src/main/docker/executor/Dockerfile
diff --git a/...etes/integration-tests-spark-jobs/pom.xml → ...etes/integration-tests-spark-jobs/pom.xml b/...etes/integration-tests-spark-jobs/pom.xml → ...etes/integration-tests-spark-jobs/pom.xml
@@ -20,8 +20,8 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-kubernetes-integration-tests-spark-jobs_2.11</artifactId>

diff --git a/...ontest/jobs/SparkPiWithInfiniteWait.scala → ...ontest/jobs/SparkPiWithInfiniteWait.scala b/...ontest/jobs/SparkPiWithInfiniteWait.scala → ...ontest/jobs/SparkPiWithInfiniteWait.scala
diff --git a/kubernetes/integration-tests/pom.xml → ...gers/kubernetes/integration-tests/pom.xml b/kubernetes/integration-tests/pom.xml → ...gers/kubernetes/integration-tests/pom.xml
@@ -20,8 +20,8 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <version>2.2.0-SNAPSHOT</version>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <artifactId>spark-kubernetes-integration-tests_2.11</artifactId>

diff --git a/...tes/integrationtest/KubernetesSuite.scala → ...tes/integrationtest/KubernetesSuite.scala b/...tes/integrationtest/KubernetesSuite.scala → ...tes/integrationtest/KubernetesSuite.scala
diff --git a/...test/docker/SparkDockerImageBuilder.scala → ...test/docker/SparkDockerImageBuilder.scala b/...test/docker/SparkDockerImageBuilder.scala → ...test/docker/SparkDockerImageBuilder.scala
diff --git a/...s/integrationtest/minikube/Minikube.scala → ...s/integrationtest/minikube/Minikube.scala b/...s/integrationtest/minikube/Minikube.scala → ...s/integrationtest/minikube/Minikube.scala
diff --git a/...grationtest/restapis/SparkRestApiV1.scala → ...grationtest/restapis/SparkRestApiV1.scala b/...grationtest/restapis/SparkRestApiV1.scala → ...grationtest/restapis/SparkRestApiV1.scala