diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 03:07:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 03:07:58 +0000 |
| commit | 1eeef229aae5affdce415c2364858e8efc64f4b5 (patch) | |
| tree | 7bbd126a3b41c4c8855a8e84ece3972030177acb /doc/user | |
| parent | 5d32a7a175fd1a7a6c97019a022c11434ea637dc (diff) | |
| download | gitlab-ce-1eeef229aae5affdce415c2364858e8efc64f4b5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/clusters/add_remove_clusters.md | 6 | ||||
| -rw-r--r-- | doc/user/project/clusters/runbooks/index.md | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/user/project/clusters/add_remove_clusters.md b/doc/user/project/clusters/add_remove_clusters.md index 7f7978d1089..dce273ce602 100644 --- a/doc/user/project/clusters/add_remove_clusters.md +++ b/doc/user/project/clusters/add_remove_clusters.md @@ -14,7 +14,7 @@ Google Kubernetes Engine Integration. All you have to do is [follow this link](h ## Before you begin -Before [adding a Kubernetes cluster](#add-new-cluster) using GitLab, you need: +Before [adding a Kubernetes cluster](#create-new-cluster) using GitLab, you need: - GitLab itself. Either: - A GitLab.com [account](https://about.gitlab.com/pricing/#gitlab-com). @@ -127,9 +127,9 @@ If you don't want to use GitLab Runner in privileged mode, either: 1. Installing a Runner [using `docker+machine`](https://docs.gitlab.com/runner/executors/docker_machine.html). -## Add new cluster +## Create new cluster -New clusters can be added using GitLab for: +New clusters can be created using GitLab for: - [Google Kubernetes Engine (GKE)](add_gke_clusters.md). - [Amazon Elastic Kubernetes Service (EKS)](add_eks_clusters.md). diff --git a/doc/user/project/clusters/runbooks/index.md b/doc/user/project/clusters/runbooks/index.md index ad3d675f158..5575cd1d2d4 100644 --- a/doc/user/project/clusters/runbooks/index.md +++ b/doc/user/project/clusters/runbooks/index.md @@ -35,7 +35,7 @@ for an overview of how this is accomplished in GitLab!** To create an executable runbook, you will need: 1. **Kubernetes** - A Kubernetes cluster is required to deploy the rest of the applications. - The simplest way to get started is to add a cluster using one of [GitLab's integrations](../add_remove_clusters.md#add-new-cluster). + The simplest way to get started is to add a cluster using one of [GitLab's integrations](../add_remove_clusters.md#create-new-cluster). 1. **Helm Tiller** - Helm is a package manager for Kubernetes and is required to install all the other applications. It is installed in its own pod inside the cluster which can run the Helm CLI in a safe environment. @@ -60,7 +60,7 @@ the components outlined above and the preloaded demo runbook. ### 1. Add a Kubernetes cluster -Follow the steps outlined in [Add new cluster](../add_remove_clusters.md#add-new-cluster) +Follow the steps outlined in [Create new cluster](../add_remove_clusters.md#create-new-cluster) to add a Kubernetes cluster to your project. ### 2. Install Helm Tiller, Ingress, and JupyterHub |