summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2017-11-16 15:34:21 +0100
committerAchilleas Pipinellis <axil@gitlab.com>2017-11-16 18:12:34 +0100
commitee7ecc815ee8abadf3f9be665e50bba439c0dd3a (patch)
tree276fca02dc832e9de84136665694f5eb0584d727 /doc
parentb7a01e08b268e6d63910ce2facdbbd41f946614b (diff)
downloadgitlab-ce-ee7ecc815ee8abadf3f9be665e50bba439c0dd3a.tar.gz
Add Ingress description from official docs
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/clusters/index.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index fda8505e898..e4d12079d1c 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -93,7 +93,7 @@ review apps and deployments.
| Application | GitLab version | Description |
| ----------- | :------------: | ----------- |
| [Helm Tiller](https://docs.helm.sh/) | 10.2+ | Helm is a package manager for Kubernetes and is required to install all the other applications. It will be automatically installed as a dependency when you try to install a different app. It is installed in its own pod inside the cluster which can run the `helm` CLI in a safe environment. |
-| [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) | 10.2+ | Ingress acts as a web proxy for your web applications and is useful if you want to use Auto DevOps or deploy your own apps. |
+| [Ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/) | 10.2+ | Ingress can provide load balancing, SSL termination and name-based virtual hosting. It acts as a web proxy for your applications and is useful if you want to use Auto DevOps or deploy your own web apps. |
## Removing the Cluster integration