Merge remote-tracking branch 'origin/branch-2.2-kubernetes' into integration-tests-reuse-minikube

Author: mccheah

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.5.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.5.0</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.5.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.5.0</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.5.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.5.0</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.5.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.5.0</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.5.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.5.0</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.5.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.5.0</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.5.0-SNAPSHOT</version>
+    <version>2.2.0-k8s-0.5.0</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.2.0-kubernetes-0.4.0
+          image: kubespark/spark-resource-staging-server:v2.2.0-kubernetes-0.5.0
           resources:
             requests:
               cpu: 100m

conf/kubernetes-shuffle-service.yaml

@@ -32,16 +32,16 @@ spec:
       volumes:
         - name: temp-volume
           hostPath:
-            path: '/tmp' # change this path according to your cluster configuration.
+            path: '/tmp/spark-local' # change this path according to your cluster configuration.
       containers:
         - name: shuffle
           # This is an official image that is built
           # from the dockerfiles/shuffle directory
           # in the spark distribution.
-          image: kubespark/spark-shuffle:v2.2.0-kubernetes-0.4.0
+          image: kubespark/spark-shuffle:v2.2.0-kubernetes-0.5.0
           imagePullPolicy: IfNotPresent
           volumeMounts:
-            - mountPath: '/tmp'
+            - mountPath: '/tmp/spark-local'
               name: temp-volume
               # more volumes can be mounted here.
               # The spark job must be configured to use these

core/pom.xml

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