From 2b2c01c5ce978cf0dcb03be3255bd64854cf9d0f Mon Sep 17 00:00:00 2001 From: foxish Date: Mon, 3 Apr 2017 13:25:11 -0700 Subject: [PATCH 1/2] Adding pointer to Kubernetes cluster manager. --- docs/cluster-overview.md | 6 +++++- docs/index.md | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/cluster-overview.md b/docs/cluster-overview.md index 814e4406cf43..dad1e2808f6c 100644 --- a/docs/cluster-overview.md +++ b/docs/cluster-overview.md @@ -52,7 +52,11 @@ The system currently supports three cluster managers: * [Apache Mesos](running-on-mesos.html) -- a general cluster manager that can also run Hadoop MapReduce and service applications. * [Hadoop YARN](running-on-yarn.html) -- the resource manager in Hadoop 2. - +* [Kubernetes (experimental)](https://github.com/apache-spark-on-k8s/spark) -- In addition to the above, +there is experimental support for Kubernetes. Kubernetes is an open-source platform +for providing container-centric infrastructure. Kubernetes support is being actively +developed in an [apache-spark-on-k8s](https://github.com/apache-spark-on-k8s/) Github organization +and is intended to eventually merge into the Apache Spark project. For documentation, refer to that project's README. # Submitting Applications diff --git a/docs/index.md b/docs/index.md index 19a9d3bfc601..ad4f24ff1a5d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -115,6 +115,7 @@ options for deployment: * [Mesos](running-on-mesos.html): deploy a private cluster using [Apache Mesos](http://mesos.apache.org) * [YARN](running-on-yarn.html): deploy Spark on top of Hadoop NextGen (YARN) + * [Kubernetes (experimental)](https://github.com/apache-spark-on-k8s/spark): deploy Spark on top of Kubernetes **Other Documents:** From c6a091c08939a803457f3cc6b54ec898ff1d35ad Mon Sep 17 00:00:00 2001 From: Anirudh Ramanathan Date: Tue, 4 Apr 2017 01:45:52 -0700 Subject: [PATCH 2/2] Remove controversial line about merging --- docs/cluster-overview.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/cluster-overview.md b/docs/cluster-overview.md index dad1e2808f6c..a2ad958959a5 100644 --- a/docs/cluster-overview.md +++ b/docs/cluster-overview.md @@ -55,8 +55,8 @@ The system currently supports three cluster managers: * [Kubernetes (experimental)](https://github.com/apache-spark-on-k8s/spark) -- In addition to the above, there is experimental support for Kubernetes. Kubernetes is an open-source platform for providing container-centric infrastructure. Kubernetes support is being actively -developed in an [apache-spark-on-k8s](https://github.com/apache-spark-on-k8s/) Github organization -and is intended to eventually merge into the Apache Spark project. For documentation, refer to that project's README. +developed in an [apache-spark-on-k8s](https://github.com/apache-spark-on-k8s/) Github organization. +For documentation, refer to that project's README. # Submitting Applications