summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-06-12 08:23:26 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-06-12 08:23:26 +0000
commit38225097c30d290f7ff6555fbf319c3efe4c103f (patch)
tree7ad723ebfd31b8783ffbecb999ac460605ba6679
parent60ded4eb5a82f0fb66750ca367ef08660af472b7 (diff)
parent86f6649d0b4b6239c9e52a1727f14c5025ca4980 (diff)
downloadgitlab-ce-38225097c30d290f7ff6555fbf319c3efe4c103f.tar.gz
Merge branch '47731-update-docs-as-gke-cluster-creation-label-has-changed-from-project-id-to-project' into 'master'
Resolve "Update docs as GKE cluster creation label has changed from "project ID" to "project"" Closes #47731 See merge request gitlab-org/gitlab-ce!19676
-rw-r--r--doc/user/project/clusters/index.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index 1e909e9f5f7..48bb2e543c1 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -41,20 +41,20 @@ new Kubernetes cluster that will be hosted on GKE to your project:
1. Navigate to your project's **Operations > Kubernetes** page.
1. Click on **Add Kubernetes cluster**.
-1. Click on **Create with GKE**.
+1. Click on **Create with Google Kubernetes Engine**.
1. Connect your Google account if you haven't done already by clicking the
**Sign in with Google** button.
1. Fill in the requested values:
- - **Cluster name** (required) - The name you wish to give the cluster.
- - **GCP project ID** (required) - The ID of the project you created in your GCP
+ - **Kubernetes cluster name** - The name you wish to give the cluster.
+ - **Environment scope** - The [associated environment](#setting-the-environment-scope) to this cluster.
+ - **Google Cloud Platform project** - The project you created in your GCP
console that will host the Kubernetes cluster. This must **not** be confused
- with the project name. Learn more about [Google Cloud Platform projects](https://cloud.google.com/resource-manager/docs/creating-managing-projects).
+ with the project ID. Learn more about [Google Cloud Platform projects](https://cloud.google.com/resource-manager/docs/creating-managing-projects).
- **Zone** - The [zone](https://cloud.google.com/compute/docs/regions-zones/)
under which the cluster will be created.
- **Number of nodes** - The number of nodes you wish the cluster to have.
- **Machine type** - The [machine type](https://cloud.google.com/compute/docs/machine-types)
of the Virtual Machine instance that the cluster will be based on.
- - **Environment scope** - The [associated environment](#setting-the-environment-scope) to this cluster.
1. Finally, click the **Create Kubernetes cluster** button.
After a few moments, your cluster should be created. If something goes wrong,