aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAnirudh Ramanathan <foxish@users.noreply.github.com>2017-04-04 10:46:44 -0700
committerReynold Xin <rxin@databricks.com>2017-04-04 10:46:44 -0700
commit11238d4c62961c03376d9b2899221ec74313363a (patch)
tree6eeb8a3861c6d5d78e6f1e921e707a96f85f8a15 /docs
parent26e7bca2295faeef22b2d9554f316c97bc240fd7 (diff)
downloadspark-11238d4c62961c03376d9b2899221ec74313363a.tar.gz
spark-11238d4c62961c03376d9b2899221ec74313363a.tar.bz2
spark-11238d4c62961c03376d9b2899221ec74313363a.zip
[SPARK-18278][SCHEDULER] Documentation to point to Kubernetes cluster scheduler
## What changes were proposed in this pull request? Adding documentation to point to Kubernetes cluster scheduler being developed out-of-repo in https://github.com/apache-spark-on-k8s/spark cc rxin srowen tnachen ash211 mccheah erikerlandson ## How was this patch tested? Docs only change Author: Anirudh Ramanathan <foxish@users.noreply.github.com> Author: foxish <ramanathana@google.com> Closes #17522 from foxish/upstream-doc.
Diffstat (limited to 'docs')
-rw-r--r--docs/cluster-overview.md6
-rw-r--r--docs/index.md1
2 files changed, 6 insertions, 1 deletions
diff --git a/docs/cluster-overview.md b/docs/cluster-overview.md
index 814e4406cf..a2ad958959 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.
+For documentation, refer to that project's README.
# Submitting Applications
diff --git a/docs/index.md b/docs/index.md
index 19a9d3bfc6..ad4f24ff1a 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:**