diff --git a/assembly/pom.xml b/assembly/pom.xml index 29ab454fee25..52b81e3130ef 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../pom.xml diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index f437084ec6dd..4a5b5a55840a 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index b80c1df88973..6adb201aeedc 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index ae9ec5918048..e10f8cf347f1 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index 60549568be0e..321dedd6b187 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/common/tags/pom.xml b/common/tags/pom.xml index 764be312470c..0c7e01d1d8dd 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index d0b543137781..3d8d25bbd1ba 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/conf/kubernetes-resource-staging-server.yaml b/conf/kubernetes-resource-staging-server.yaml index 80d59b809190..18b446574fda 100644 --- a/conf/kubernetes-resource-staging-server.yaml +++ b/conf/kubernetes-resource-staging-server.yaml @@ -15,7 +15,7 @@ # limitations under the License. # --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1beta1 kind: Deployment metadata: name: spark-resource-staging-server @@ -32,14 +32,14 @@ spec: name: spark-resource-staging-server-config containers: - name: spark-resource-staging-server - image: kubespark/spark-resource-staging-server:v2.2.0-kubernetes-0.3.0 + image: kubespark/spark-resource-staging-server:v2.2.0-kubernetes-0.4.0 resources: requests: cpu: 100m memory: 256Mi limits: cpu: 100m - memory: 256Mi + memory: 1Gi volumeMounts: - name: resource-staging-server-properties mountPath: '/etc/spark-resource-staging-server' diff --git a/conf/kubernetes-shuffle-service.yaml b/conf/kubernetes-shuffle-service.yaml index 8ab0b362ea32..6f02106ff06c 100644 --- a/conf/kubernetes-shuffle-service.yaml +++ b/conf/kubernetes-shuffle-service.yaml @@ -32,13 +32,13 @@ spec: volumes: - name: temp-volume hostPath: - path: '/var/tmp' # change this path according to your cluster configuration. + path: '/tmp' # 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.3.0 + image: kubespark/spark-shuffle:v2.2.0-kubernetes-0.4.0 imagePullPolicy: IfNotPresent volumeMounts: - mountPath: '/tmp' diff --git a/core/pom.xml b/core/pom.xml index a152b27284ab..d9706395bb05 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../pom.xml diff --git a/examples/pom.xml b/examples/pom.xml index 3f7814d06052..25f3188c97ad 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../pom.xml diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index f90eb57c64df..e62d606f2ce6 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index 8592d85ccbd3..2ad920b0060e 100644 --- a/external/flume-assembly/pom.xml +++ b/external/flume-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index ef0231990c3c..894604ce3250 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 606116ad0860..2e48a86408b7 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/java8-tests/pom.xml b/external/java8-tests/pom.xml index 586f87d312ec..b78a5e32c547 100644 --- a/external/java8-tests/pom.xml +++ b/external/java8-tests/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index 39e1339bbf2a..7c7ee1411230 100644 --- a/external/kafka-0-10-assembly/pom.xml +++ b/external/kafka-0-10-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index 68ee5be2889b..e700967c20c3 100644 --- a/external/kafka-0-10-sql/pom.xml +++ b/external/kafka-0-10-sql/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index 23e4eef8253b..b61f4292d5d1 100644 --- a/external/kafka-0-10/pom.xml +++ b/external/kafka-0-10/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/kafka-0-8-assembly/pom.xml b/external/kafka-0-8-assembly/pom.xml index aa36d4a713e1..c18d0ba6b515 100644 --- a/external/kafka-0-8-assembly/pom.xml +++ b/external/kafka-0-8-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index af7de9380e27..ca66cd3cfea5 100644 --- a/external/kafka-0-8/pom.xml +++ b/external/kafka-0-8/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index ced0e89bdff1..e629143dcb96 100644 --- a/external/kinesis-asl-assembly/pom.xml +++ b/external/kinesis-asl-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 0ae897f62dda..863c2eac4d8a 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index 2744a9fdea48..39febb021087 100644 --- a/external/spark-ganglia-lgpl/pom.xml +++ b/external/spark-ganglia-lgpl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index e59db233b54d..2bee93dfa3d0 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../pom.xml diff --git a/launcher/pom.xml b/launcher/pom.xml index 9df0c2d79a5f..c38d90d93095 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../pom.xml diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index d120f8f3fc4f..858ebc30ecf5 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 755f1cfe954f..7dd0bffb2948 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../pom.xml diff --git a/pom.xml b/pom.xml index d90ad23752f5..2abe588a36db 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 pom Spark Project Parent POM http://spark.apache.org/ diff --git a/repl/pom.xml b/repl/pom.xml index c042a69c1464..e859618ea527 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../pom.xml diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index dfbf8adc5bc7..a740ae33a5bc 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../../pom.xml diff --git a/resource-managers/kubernetes/docker-minimal-bundle/pom.xml b/resource-managers/kubernetes/docker-minimal-bundle/pom.xml index 585d8d474bba..b20909a40989 100644 --- a/resource-managers/kubernetes/docker-minimal-bundle/pom.xml +++ b/resource-managers/kubernetes/docker-minimal-bundle/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../../pom.xml diff --git a/resource-managers/kubernetes/integration-tests-spark-jobs-helpers/pom.xml b/resource-managers/kubernetes/integration-tests-spark-jobs-helpers/pom.xml index 2e877daf95c6..b4a14e186e14 100644 --- a/resource-managers/kubernetes/integration-tests-spark-jobs-helpers/pom.xml +++ b/resource-managers/kubernetes/integration-tests-spark-jobs-helpers/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../../pom.xml diff --git a/resource-managers/kubernetes/integration-tests-spark-jobs/pom.xml b/resource-managers/kubernetes/integration-tests-spark-jobs/pom.xml index 276bbabdf32e..14cfebac9bca 100644 --- a/resource-managers/kubernetes/integration-tests-spark-jobs/pom.xml +++ b/resource-managers/kubernetes/integration-tests-spark-jobs/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../../pom.xml diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index fc28026de1e4..af4c05104480 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../../pom.xml diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index db492f57120e..b8d0ed88500a 100644 --- a/resource-managers/mesos/pom.xml +++ b/resource-managers/mesos/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index a59cf8c5eb5a..f3b5d650f40f 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 60fed70731bf..444b82da596f 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 4b55cc859005..0ac7ab0073e3 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index caa5da8b4d8b..0694c8e0e5fe 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index df9535de6677..810de105f4b6 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index e5ffe7af8c04..1e6a50159553 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 7ca0a9bb2d3a..71d48190e556 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.2.0-k8s-0.4.0-SNAPSHOT + 2.2.0-k8s-0.4.0 ../pom.xml