Sync'd to branch-2.2-kubernetes

Author: kimoonkim

README.md

@@ -10,6 +10,7 @@ This is a collaboratively maintained project working on [SPARK-18278](https://is
 
 - [Usage guide](https://apache-spark-on-k8s.github.io/userdocs/) shows how to run the code
 - [Development docs](resource-managers/kubernetes/README.md) shows how to get set up for development
+- [Architecture docs](resource-managers/kubernetes/architecture-docs/) shows the high level architecture of Spark on Kubernetes
 - Code is primarily located in the [resource-managers/kubernetes](resource-managers/kubernetes) folder
 
 ## Why does this fork exist?

assembly/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.2.0-k8s-0.3.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

common/network-common/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.2.0-k8s-0.3.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

common/network-shuffle/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.2.0-k8s-0.3.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

common/network-yarn/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.2.0-k8s-0.3.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

common/sketch/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.2.0-k8s-0.3.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

common/tags/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.2.0-k8s-0.3.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

common/unsafe/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent_2.11</artifactId>
-    <version>2.2.0-k8s-0.3.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.4.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

conf/kubernetes-resource-staging-server.yaml

@@ -32,7 +32,7 @@ spec:
             name: spark-resource-staging-server-config
       containers:
         - name: spark-resource-staging-server
-          image: kubespark/spark-resource-staging-server:v2.1.0-kubernetes-0.2.0
+          image: kubespark/spark-resource-staging-server:v2.2.0-kubernetes-0.3.0
           resources:
             requests:
               cpu: 100m

conf/kubernetes-shuffle-service.yaml

@@ -20,14 +20,14 @@ kind: DaemonSet
 metadata:
   labels:
     app: spark-shuffle-service
-    spark-version: 2.1.0
+    spark-version: 2.2.0
   name: shuffle
 spec:
   template:
     metadata:
       labels:
         app: spark-shuffle-service
-        spark-version: 2.1.0
+        spark-version: 2.2.0
     spec:
       volumes:
         - name: temp-volume
@@ -38,7 +38,7 @@ spec:
           # This is an official image that is built
           # from the dockerfiles/shuffle directory
           # in the spark distribution.
-          image: kubespark/spark-shuffle:v2.1.0-kubernetes-0.2.0
+          image: kubespark/spark-shuffle:v2.2.0-kubernetes-0.3.0
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - mountPath: '/tmp'
@@ -51,4 +51,4 @@ spec:
              requests:
                cpu: "1"
              limits:
-               cpu: "1"
+               cpu: "1"