From 51030cf2fafebcd3a0261e75170dfb77b302613d Mon Sep 17 00:00:00 2001 From: foxish Date: Tue, 21 Mar 2017 00:00:54 -0700 Subject: [PATCH 1/2] Update cluster-overview doc --- docs/cluster-overview.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/cluster-overview.md b/docs/cluster-overview.md index 814e4406cf435..cf7e530eaed1e 100644 --- a/docs/cluster-overview.md +++ b/docs/cluster-overview.md @@ -53,6 +53,11 @@ The system currently supports three cluster managers: and service applications. * [Hadoop YARN](running-on-yarn.html) -- the resource manager in Hadoop 2. +In addition to the above, there is experimental support for Kubernetes. +[Kubernetes](https://kubernetes.io/) is an open-source platform for providing container-centric infrastructure. +Kubernetes support is being actively developed in a [Spark-Kubernetes](https://github.com/apache-spark-on-k8s/spark) +fork and will eventually merge into the Apache Spark project. For documentation, +refer to the project [README](https://github.com/apache-spark-on-k8s/spark/blob/branch-2.1-kubernetes/README.md). # Submitting Applications From 6460bbf95edd7b6caa632b7a521c4bc7b1ad24e6 Mon Sep 17 00:00:00 2001 From: Andrew Ash Date: Thu, 23 Mar 2017 16:31:59 -0700 Subject: [PATCH 2/2] Update cluster-overview.md --- docs/cluster-overview.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/cluster-overview.md b/docs/cluster-overview.md index cf7e530eaed1e..258138b997756 100644 --- a/docs/cluster-overview.md +++ b/docs/cluster-overview.md @@ -55,9 +55,9 @@ The system currently supports three cluster managers: In addition to the above, there is experimental support for Kubernetes. [Kubernetes](https://kubernetes.io/) is an open-source platform for providing container-centric infrastructure. -Kubernetes support is being actively developed in a [Spark-Kubernetes](https://github.com/apache-spark-on-k8s/spark) -fork and will eventually merge into the Apache Spark project. For documentation, -refer to the project [README](https://github.com/apache-spark-on-k8s/spark/blob/branch-2.1-kubernetes/README.md). +Kubernetes support is being actively developed in an [apache-spark-on-k8s](https://github.com/apache-spark-on-k8s/spark) +Github org and will eventually merge into the Apache Spark project. For documentation, +refer to that project README. # Submitting Applications