summaryrefslogtreecommitdiff
path: root/doc/user
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-10-24 07:56:39 +0300
committerEric Eastwood <contact@ericeastwood.com>2017-11-03 11:28:57 -0500
commit797e758beb882d67f32b87db6453cad41c0b931f (patch)
tree7e3a35aa71b0d484f727a29f88f16f3b3d0ffa29 /doc/user
parente6616e0468deaf1e37ddddc9332cc3e677567410 (diff)
downloadgitlab-ce-797e758beb882d67f32b87db6453cad41c0b931f.tar.gz
Add applications section to GKE clusters page
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/project/clusters/img/cluster-applications.pngbin0 -> 38153 bytes
-rw-r--r--doc/user/project/clusters/index.md9
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/user/project/clusters/img/cluster-applications.png b/doc/user/project/clusters/img/cluster-applications.png
new file mode 100644
index 00000000000..794f3331296
--- /dev/null
+++ b/doc/user/project/clusters/img/cluster-applications.png
Binary files differ
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 7d9e771f570..27b4b49c207 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -88,3 +88,12 @@ To remove the Cluster integration from your project, simply click on the
and [add a cluster](#adding-a-cluster) again.
[permissions]: ../../permissions.md
+
+## Installing applications
+
+GitLab provides a one-click install for
+[Helm Tiller](https://docs.helm.sh/) and
+[Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/)
+which will be added directly to your configured cluster.
+
+![Cluster application settings](img/cluster-applications.png)