diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2017-11-16 18:17:27 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2017-11-16 18:17:27 +0100 |
| commit | bacf671a335297e61ad4c470cde49ce4d3fcc009 (patch) | |
| tree | 176e8dc9f8f8653b866d472a4968460b09e36bd6 | |
| parent | 3b9773fc3d1942370f9787a0384d94dfa35920b3 (diff) | |
| download | gitlab-ce-docs/refactor-cluster.tar.gz | |
Move installation of apps higherdocs/refactor-cluster
| -rw-r--r-- | doc/user/project/clusters/index.md | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md index 01949f5cd23..cf0c7c109a8 100644 --- a/doc/user/project/clusters/index.md +++ b/doc/user/project/clusters/index.md @@ -70,7 +70,19 @@ To add a new cluster: After a few moments, your cluster should be created. If something goes wrong, you will be notified. -Now, you can proceed to [enable the Cluster integration](#enabling-or-disabling-the-cluster-integration). +You can now proceed to install some pre-defined applications and then +enable the Cluster integration. + +## Installing applications + +GitLab provides a one-click install for various applications which will be +added directly to your configured cluster. Those applications are needed for +[Review Apps](../../../ci/review_apps/index.md) and [deployments](../../../ci/environments.md). + +| 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 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](../../../topics/autodevops/index.md) or deploy your own web apps. | ## Enabling or disabling the Cluster integration @@ -84,17 +96,6 @@ You can now start using your Kubernetes cluster for your deployments. To disable the Cluster integration, follow the same procedure. -## Installing applications - -GitLab provides a one-click install for various applications which will be -added directly to your configured cluster. Those applications are needed for -[Review Apps](../../../ci/review_apps/index.md) and [deployments](../../../ci/environments.md). - -| 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 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](../../../topics/autodevops/index.md) or deploy your own web apps. | - ## Removing the Cluster integration NOTE: **Note:** |