Merge branch 'docs/add-structure-to-cluster-topic' into 'master'

Restructure project cluster topic See merge request gitlab-org/gitlab-ce!31081

Merge branch 'docs/add-structure-to-cluster-topic' into 'master'
Restructure project cluster topic See merge request gitlab-org/gitlab-ce!31081
b3600e31 · Marcia Ramos · 95b117f0 · 82a8632b · b3600e31 · b3600e31
Commit b3600e31 authored Jul 25, 2019 by Marcia Ramos
8 changed files
--- a/doc/README.md
+++ b/doc/README.md
@@ -302,7 +302,7 @@ The following documentation relates to the DevOps **Configure** stage:
 | Configure Topics                                                                                                                   | Description                                                               |
 |:-----------------------------------------------------------------------------------------------------------------------------------|:--------------------------------------------------------------------------|
 | [Auto DevOps](topics/autodevops/index.md)                                                                                          | Automatically employ a complete DevOps lifecycle.                         |
-| [Easy creation of Kubernetes<br/>clusters on GKE](user/project/clusters/index.md#adding-and-creating-a-new-gke-cluster-via-gitlab) | Use Google Kubernetes Engine and GitLab.                                  |
+| [Create Kubernetes clusters on GKE](user/project/clusters/index.md#add-new-gke-cluster) | Use Google Kubernetes Engine and GitLab.                                  |
 | [Executable Runbooks](user/project/clusters/runbooks/index.md)                                                                     | Documented procedures that explain how to carry out particular processes. |
 | [GitLab ChatOps](ci/chatops/README.md)                                                                                             | Interact with CI/CD jobs through chat services.                           |
 | [Installing Applications](user/project/clusters/index.md#installing-applications)                                                  | Deploy Helm, Ingress, and Prometheus on Kubernetes.                       |

--- a/doc/api/group_clusters.md
+++ b/doc/api/group_clusters.md
@@ -210,7 +210,7 @@ Parameters:
 NOTE: **Note:**
 `name`, `api_url`, `ca_cert` and `token` can only be updated if the cluster was added
-through the ["Add an existing Kubernetes Cluster"](../user/project/clusters/index.md#adding-an-existing-kubernetes-cluster) option or
+through the ["Add existing Kubernetes cluster"](../user/project/clusters/index.md#add-existing-kubernetes-cluster) option or
 through the ["Add existing cluster to group"](#add-existing-cluster-to-group) endpoint.
 Example request:

--- a/doc/api/project_clusters.md
+++ b/doc/api/project_clusters.md
@@ -261,7 +261,7 @@ Parameters:
 NOTE: **Note:**
 `name`, `api_url`, `ca_cert` and `token` can only be updated if the cluster was added
-through the ["Add an existing Kubernetes Cluster"](../user/project/clusters/index.md#adding-an-existing-kubernetes-cluster) option or
+through the ["Add existing Kubernetes cluster"](../user/project/clusters/index.md#add-existing-kubernetes-cluster) option or
 through the ["Add existing cluster to project"](#add-existing-cluster-to-project) endpoint.
 Example request:

--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -1058,7 +1058,7 @@ planned for a subsequent release.
  case, you may need to customize your `.gitlab-ci.yml` with your test commands.
 - Auto Deploy will fail if GitLab can not create a Kubernetes namespace and
  service account for your project. For help debugging this issue, see
-  [Troubleshooting failed deployment jobs](../../user/project/clusters/index.md#troubleshooting-failed-deployment-jobs).
+  [Troubleshooting failed deployment jobs](../../user/project/clusters/index.md#troubleshooting).
 ### Disable the banner instance wide

--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -5,11 +5,12 @@ be added directly to your configured cluster. These applications are
 needed for [Review Apps](../../ci/review_apps/index.md) and
 [deployments](../../ci/environments.md) when using [Auto DevOps](../../topics/autodevops/index.md).
 You can install them after you
-[create a cluster](../project/clusters/index.md#adding-and-creating-a-new-gke-cluster-via-gitlab).
+[create a cluster](../project/clusters/index.md#add-new-gke-cluster).
 ## Installing applications
 Applications managed by GitLab will be installed onto the `gitlab-managed-apps` namespace.
 This namespace:
 - Is different from the namespace used for project deployments.

--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
-# Connecting GitLab with a Kubernetes cluster
+# Kubernetes clusters
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/35954) in GitLab 10.1.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/35954) for
+>   projects in GitLab 10.1.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/34758) for
+>   [groups](../../group/clusters/index.md) in GitLab 11.6.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/39840) for
+>   [instances](../../instance/clusters/index.md) in GitLab 11.11.
-Connect your project to Google Kubernetes Engine (GKE) or an existing Kubernetes
+GitLab provides many features with a Kubernetes integration. Kubernetes can be
-cluster in a few steps.
+integrated with projects, but also:
+- [Groups](../../group/clusters/index.md).
+- [Instances](../../instance/clusters/index.md).
 NOTE: **Scalable app deployment with GitLab and Google Cloud Platform**
 [Watch the webcast](https://about.gitlab.com/webcast/scalable-app-deploy/) and learn how to spin up a Kubernetes cluster managed by Google Cloud Platform (GCP) in a few clicks.
 ## Overview
-With one or more Kubernetes clusters associated to your project, you can use
+Using the GitLab project Kubernetes integration, you can:
-[Review Apps](../../../ci/review_apps/index.md), deploy your applications, run
-your pipelines, use it with [Auto DevOps](../../../topics/autodevops/index.md),
+- Use [Review Apps](../../../ci/review_apps/index.md).
-and much more, all from within GitLab.
+- Run [pipelines](../../../ci/pipelines.md).
+- [Deploy](#deploying-to-a-kubernetes-cluster) your applications.
+- Detect and [monitor Kubernetes](#kubernetes-monitoring).
+- Use it with [Auto DevOps](#auto-devops).
+- Use [Web terminals](#web-terminals).
+- Use [Deploy Boards](#deploy-boards-premium). **(PREMIUM)**
+- Use [Canary Deployments](#canary-deployments-premium). **(PREMIUM)**
+- View [Pod logs](#pod-logs-ultimate). **(ULTIMATE)**
+You can also:
+- Connect and deploy to an [Amazon EKS cluster](eks_and_gitlab/index.html).
+- Run serverless workloads on [Kubernetes with Knative](serverless/index.md).
+### Deploy Boards **(PREMIUM)**
+GitLab's Deploy Boards offer a consolidated view of the current health and
+status of each CI [environment](../../../ci/environments.md) running on Kubernetes,
+displaying the status of the pods in the deployment. Developers and other
+teammates can view the progress and status of a rollout, pod by pod, in the
+workflow they already use without any need to access Kubernetes.
+[Read more about Deploy Boards](../deploy_boards.md)
+### Canary Deployments **(PREMIUM)**
+Leverage [Kubernetes' Canary deployments](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments)
+and visualize your canary deployments right inside the Deploy Board, without
+the need to leave GitLab.
+[Read more about Canary Deployments](../canary_deployments.md)
+### Pod logs **(ULTIMATE)**
+GitLab makes it easy to view the logs of running pods in connected Kubernetes clusters. By displaying the logs directly in GitLab, developers can avoid having to manage console tools or jump to a different interface.
+[Read more about Kubernetes pod logs](kubernetes_pod_logs.md)
+### Kubernetes monitoring
-There are two options when adding a new cluster to your project; either associate
+Automatically detect and monitor Kubernetes metrics. Automatic monitoring of
-your account with Google Kubernetes Engine (GKE) so that you can [create new
+[NGINX ingress](../integrations/prometheus_library/nginx.md) is also supported.
-clusters](#adding-and-creating-a-new-gke-cluster-via-gitlab) from within GitLab,
-or provide the credentials to an [existing Kubernetes cluster](#adding-an-existing-kubernetes-cluster).
+[Read more about Kubernetes monitoring](../integrations/prometheus_library/kubernetes.md)
+### Auto DevOps
+Auto DevOps automatically detects, builds, tests, deploys, and monitors your
+applications.
+To make full use of Auto DevOps(Auto Deploy, Auto Review Apps, and Auto Monitoring)
+you will need the Kubernetes project integration enabled.
+[Read more about Auto DevOps](../../../topics/autodevops/index.md)
+### Web terminals
 NOTE: **Note:**
-From [GitLab 11.6](https://gitlab.com/gitlab-org/gitlab-ce/issues/34758) you
+Introduced in GitLab 8.15. You must be the project owner or have `maintainer` permissions
-can also associate a Kubernetes cluster to your groups and from
+to use terminals. Support is limited to the first container in the
-[GitLab 11.11](https://gitlab.com/gitlab-org/gitlab-ce/issues/39840),
+first pod of your environment.
-to the GitLab instance. Learn more about [group-level](../../group/clusters/index.md)
-and [instance-level](../../instance/clusters/index.md) Kubernetes clusters.
+When enabled, the Kubernetes service adds [web terminal](../../../ci/environments.md#web-terminals)
+support to your [environments](../../../ci/environments.md). This is based on the `exec` functionality found in
+Docker and Kubernetes, so you get a new shell session within your existing
+containers. To use this integration, you should deploy to Kubernetes using
+the deployment variables above, ensuring any deployments, replica sets, and
+pods are annotated with:
-## Adding and creating a new GKE cluster via GitLab
+- `app.gitlab.com/env: $CI_ENVIRONMENT_SLUG`
+- `app.gitlab.com/app: $CI_PROJECT_PATH_SLUG`
+`$CI_ENVIRONMENT_SLUG` and `$CI_PROJECT_PATH_SLUG` are the values of
+the CI variables.
+## Adding and removing clusters
+There are two options when adding a new cluster to your project:
+- Associate your account with Google Kubernetes Engine (GKE) to
+  [create new clusters](#add-new-gke-cluster) from within GitLab.
+- Provide credentials to an
+  [existing Kubernetes cluster](#add-existing-kubernetes-cluster).
+### Add new GKE cluster
 TIP: **Tip:**
 Every new Google Cloud Platform (GCP) account receives [$300 in credit upon sign up](https://console.cloud.google.com/freetrial),
@@ -39,7 +117,7 @@ The [Google authentication integration](../../../integration/google.md) must
 be enabled in GitLab at the instance level. If that's not the case, ask your
 GitLab administrator to enable it. On GitLab.com, this is enabled.
-### Requirements
+#### Requirements
 Before creating your first cluster on Google Kubernetes Engine with GitLab's
 integration, make sure the following requirements are met:
@@ -49,7 +127,7 @@ integration, make sure the following requirements are met:
 - The Kubernetes Engine API and related service are enabled. It should work immediately but may take up to 10 minutes after you create a project. For more information see the
  ["Before you begin" section of the Kubernetes Engine docs](https://cloud.google.com/kubernetes-engine/docs/quickstart#before-you-begin).
-### Creating the cluster
+#### Creating the cluster
 If all of the above requirements are met, you can proceed to create and add a
 new Kubernetes cluster to your project:
@@ -57,7 +135,7 @@ new Kubernetes cluster to your project:
 1. Navigate to your project's **Operations > Kubernetes** page.
   NOTE: **Note:**
-   You need Maintainer [permissions] and above to access the Kubernetes page.
+   You need Maintainer [permissions](../../permissions.md) and above to access the Kubernetes page.
 1. Click **Add Kubernetes cluster**.
 1. Click **Create with Google Kubernetes Engine**.
@@ -91,14 +169,14 @@ client certificate is enabled.
 NOTE: **Note:**
 Starting from [GitLab 12.1](https://gitlab.com/gitlab-org/gitlab-ce/issues/55902), all GKE clusters created by GitLab are RBAC enabled. Take a look at the [RBAC section](#rbac-cluster-resources) for more information.
-## Adding an existing Kubernetes cluster
+### Add existing Kubernetes cluster
 To add an existing Kubernetes cluster to your project:
 1. Navigate to your project's **Operations > Kubernetes** page.
   NOTE: **Note:**
-   You need Maintainer [permissions] and above to access the Kubernetes page.
+   You need Maintainer [permissions](../../permissions.md) and above to access the Kubernetes page.
 1. Click **Add Kubernetes cluster**.
 1. Click **Add an existing Kubernetes cluster** and fill in the details:
@@ -216,7 +294,36 @@ To add an existing Kubernetes cluster to your project:
 After a couple of minutes, your cluster will be ready to go. You can now proceed
 to install some [pre-defined applications](#installing-applications).
-## Security implications
+### Enabling or disabling integration
+After you have successfully added your cluster information, you can enable the
+Kubernetes cluster integration:
+1. Click the **Enabled/Disabled** switch
+1. Hit **Save** for the changes to take effect
+To disable the Kubernetes cluster integration, follow the same procedure.
+### Removing integration
+NOTE: **Note:**
+You need Maintainer [permissions](../../permissions.md) and above to remove a Kubernetes cluster integration.
+NOTE: **Note:**
+When you remove a cluster, you only remove its relation to GitLab, not the
+cluster itself. To remove the cluster, you can do so by visiting the GKE
+dashboard or using `kubectl`.
+To remove the Kubernetes cluster integration from your project, simply click the
+**Remove integration** button. You will then be able to follow the procedure
+and add a Kubernetes cluster again.
+## Cluster configuration
+This section covers important considerations for configuring Kubernetes
+clusters with GitLab.
+### Security implications
 CAUTION: **Important:**
 The whole cluster security is based on a model where [developers](../../permissions.md)
@@ -227,7 +334,7 @@ functionalities needed to successfully build and deploy a containerized
 application. Bear in mind that the same credentials are used for all the
 applications running on the cluster.
-## GitLab-managed clusters
+### GitLab-managed clusters
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011) in GitLab 11.5.
 > Became [optional](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26565) in GitLab 11.11.
@@ -246,7 +353,7 @@ NOTE: **Note:**
 If you [install applications](#installing-applications) on your cluster, GitLab will create
 the resources required to run these even if you have chosen to manage your own cluster.
-## Base domain
+### Base domain
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24580) in GitLab 11.8.
@@ -264,7 +371,7 @@ you can either:
 - Create an `A` record that points to the Ingress IP address with your domain provider.
 - Enter a wildcard DNS address using a service such as nip.io or xip.io. For example, `192.168.1.1.xip.io`.
-## Access controls
+### Access controls
 When creating a cluster in GitLab, you will be asked if you would like to create either:
@@ -294,12 +401,12 @@ Helm will also create additional service accounts and other resources for each
 installed application. Consult the documentation of the Helm charts for each application
 for details.
-If you are [adding an existing Kubernetes cluster](#adding-an-existing-kubernetes-cluster),
+If you are [adding an existing Kubernetes cluster](#add-existing-kubernetes-cluster),
 ensure the token of the account has administrator privileges for the cluster.
 The resources created by GitLab differ depending on the type of cluster.
-### ABAC cluster resources
+#### ABAC cluster resources
 GitLab creates the following resources for ABAC clusters.
@@ -312,7 +419,7 @@ GitLab creates the following resources for ABAC clusters.
 | Project namespace | `ServiceAccount`     | Uses namespace of Project         | Deploying to a cluster     |
 | Project namespace | `Secret`             | Token for project ServiceAccount  | Deploying to a cluster     |
-### RBAC cluster resources
+#### RBAC cluster resources
 GitLab creates the following resources for RBAC clusters.
@@ -330,11 +437,12 @@ GitLab creates the following resources for RBAC clusters.
 NOTE: **Note:**
 Project-specific resources are only created if your cluster is [managed by GitLab](#gitlab-managed-clusters).
-### Security of GitLab Runners
+#### Security of GitLab Runners
 GitLab Runners have the [privileged mode](https://docs.gitlab.com/runner/executors/docker.html#the-privileged-mode)
 enabled by default, which allows them to execute special commands and running
-Docker in Docker. This functionality is needed to run some of the [Auto DevOps]
+Docker in Docker. This functionality is needed to run some of the
+[Auto DevOps](../../../topics/autodevops/index.md)
 jobs. This implies the containers are running in privileged mode and you should,
 therefore, be aware of some important details.
@@ -353,6 +461,69 @@ 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).
+### Setting the environment scope **(PREMIUM)**
+When adding more than one Kubernetes cluster to your project, you need to differentiate
+them with an environment scope. The environment scope associates clusters with [environments](../../../ci/environments.md) similar to how the
+[environment-specific variables](../../../ci/variables/README.md#limiting-environment-scopes-of-environment-variables-premium) work.
+The default environment scope is `*`, which means all jobs, regardless of their
+environment, will use that cluster. Each scope can only be used by a single
+cluster in a project, and a validation error will occur if otherwise.
+Also, jobs that don't have an environment keyword set will not be able to access any cluster.
+For example, let's say the following Kubernetes clusters exist in a project:
+| Cluster     | Environment scope |
+| ----------- | ----------------- |
+| Development | `*`               |
+| Staging     | `staging`         |
+| Production  | `production`      |
+And the following environments are set in [`.gitlab-ci.yml`](../../../ci/yaml/README.md):
+```yaml
+stages:
+- test
+- deploy
+test:
+  stage: test
+  script: sh test
+deploy to staging:
+  stage: deploy
+  script: make deploy
+  environment:
+    name: staging
+    url: https://staging.example.com/
+deploy to production:
+  stage: deploy
+  script: make deploy
+  environment:
+    name: production
+    url: https://example.com/
+```
+The result will then be:
+- The development cluster will be used for the "test" job.
+- The staging cluster will be used for the "deploy to staging" job.
+- The production cluster will be used for the "deploy to production" job.
+### Multiple Kubernetes clusters **(PREMIUM)**
+> Introduced in [GitLab Premium](https://about.gitlab.com/pricing/) 10.3.
+With GitLab Premium, you can associate more than one Kubernetes cluster to your
+project. That way you can have different clusters for different environments,
+like dev, staging, production, etc.
+Simply add another cluster, like you did the first time, and make sure to
+[set an environment scope](#setting-the-environment-scope-premium) that will
+differentiate the new cluster with the rest.
 ## Installing applications
 GitLab can install and manage some applications in your project-level
@@ -360,7 +531,7 @@ cluster. For more information on installing, upgrading, uninstalling,
 and troubleshooting applications for your project cluster, see
 [Gitlab Managed Apps](../../clusters/applications.md).
-## Getting the external endpoint
+### Getting the external endpoint
 NOTE: **Note:**
 With the following procedure, a load balancer must be installed in your cluster
@@ -371,7 +542,7 @@ to obtain the endpoint. You can use either
 In order to publish your web application, you first need to find the endpoint which will be either an IP
 address or a hostname associated with your load balancer.
-### Automatically determining the external endpoint
+#### Automatically determining the external endpoint
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17052) in GitLab 10.6.
@@ -386,7 +557,7 @@ and your cluster runs on Google Kubernetes Engine:
 If GitLab is still unable to determine the endpoint of your Ingress or Knative application, you can
 manually determine it by following the steps below.
-### Manually determining the external endpoint
+#### Manually determining the external endpoint
 If the cluster is on GKE, click the **Google Kubernetes Engine** link in the
 **Advanced settings**, or go directly to the
@@ -425,7 +596,7 @@ Otherwise, you can list the IP addresses of all load balancers:
 kubectl get svc --all-namespaces -o jsonpath='{range.items[?(@.status.loadBalancer.ingress)]}{.status.loadBalancer.ingress[*].ip} '
 ```
-### Using a static IP
+#### Using a static IP
 By default, an ephemeral external IP address is associated to the cluster's load
 balancer. If you associate the ephemeral IP with your DNS and the IP changes,
@@ -435,79 +606,19 @@ reserved IP.
 Read how to [promote an ephemeral external IP address in GKE](https://cloud.google.com/compute/docs/ip-addresses/reserve-static-external-ip-address#promote_ephemeral_ip).
-### Pointing your DNS at the external endpoint
+#### Pointing your DNS at the external endpoint
 Once you've set up the external endpoint, you should associate it with a [wildcard DNS
 record](https://en.wikipedia.org/wiki/Wildcard_DNS_record) such as `*.example.com.`
 in order to be able to reach your apps. If your external endpoint is an IP address,
 use an A record. If your external endpoint is a hostname, use a CNAME record.
-## Multiple Kubernetes clusters **(PREMIUM)**
+## Deploying to a Kubernetes cluster
-> Introduced in [GitLab Premium][ee] 10.3.
+A Kubernetes cluster can be the destination for a deployment job, using
+special [deployment variables](#deployment-variables).
-With GitLab Premium, you can associate more than one Kubernetes clusters to your
+### Deployment variables
-project. That way you can have different clusters for different environments,
-like dev, staging, production, etc.
-Simply add another cluster, like you did the first time, and make sure to
-[set an environment scope](#setting-the-environment-scope-premium) that will
-differentiate the new cluster with the rest.
-## Setting the environment scope **(PREMIUM)**
-When adding more than one Kubernetes cluster to your project, you need to differentiate
-them with an environment scope. The environment scope associates clusters with [environments](../../../ci/environments.md) similar to how the
-[environment-specific variables](../../../ci/variables/README.md#limiting-environment-scopes-of-environment-variables-premium) work.
-The default environment scope is `*`, which means all jobs, regardless of their
-environment, will use that cluster. Each scope can only be used by a single
-cluster in a project, and a validation error will occur if otherwise.
-Also, jobs that don't have an environment keyword set will not be able to access any cluster.
---
-For example, let's say the following Kubernetes clusters exist in a project:
-| Cluster     | Environment scope |
-| ----------- | ----------------- |
-| Development | `*`               |
-| Staging     | `staging`         |
-| Production  | `production`      |
-And the following environments are set in [`.gitlab-ci.yml`](../../../ci/yaml/README.md):
-```yaml
-stages:
- test
- deploy
-test:
-  stage: test
-  script: sh test
-deploy to staging:
-  stage: deploy
-  script: make deploy
-  environment:
-    name: staging
-    url: https://staging.example.com/
-deploy to production:
-  stage: deploy
-  script: make deploy
-  environment:
-    name: production
-    url: https://example.com/
-```
-The result will then be:
- The development cluster will be used for the "test" job.
- The staging cluster will be used for the "deploy to staging" job.
- The production cluster will be used for the "deploy to production" job.
-## Deployment variables
 The Kubernetes cluster integration exposes the following
 [deployment variables](../../../ci/variables/README.md#deployment-environment-variables) in the
@@ -527,7 +638,7 @@ NOTE: **NOTE:**
 Prior to GitLab 11.5, `KUBE_TOKEN` was the Kubernetes token of the main
 service account of the cluster integration.
-### Troubleshooting failed deployment jobs
+### Troubleshooting
 Before the deployment jobs starts, GitLab creates the following specifically for
 the deployment job:
@@ -559,105 +670,8 @@ namespaces and service accounts yourself.
 ## Monitoring your Kubernetes cluster **(ULTIMATE)**
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4701) in [GitLab Ultimate][ee] 10.6.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4701) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.6.
 When [Prometheus is deployed](#installing-applications), GitLab will automatically monitor the cluster's health. At the top of the cluster settings page, CPU and Memory utilization is displayed, along with the total amount available. Keeping an eye on cluster resources can be important, if the cluster runs out of memory pods may be shutdown or fail to start.
 ![Cluster Monitoring](img/k8s_cluster_monitoring.png)
-## Enabling or disabling the Kubernetes cluster integration
-After you have successfully added your cluster information, you can enable the
-Kubernetes cluster integration:
-1. Click the **Enabled/Disabled** switch
-1. Hit **Save** for the changes to take effect
-You can now start using your Kubernetes cluster for your deployments.
-To disable the Kubernetes cluster integration, follow the same procedure.
-## Removing the Kubernetes cluster integration
-NOTE: **Note:**
-You need Maintainer [permissions] and above to remove a Kubernetes cluster integration.
-NOTE: **Note:**
-When you remove a cluster, you only remove its relation to GitLab, not the
-cluster itself. To remove the cluster, you can do so by visiting the GKE
-dashboard or using `kubectl`.
-To remove the Kubernetes cluster integration from your project, simply click the
-**Remove integration** button. You will then be able to follow the procedure
-and add a Kubernetes cluster again.
-## What you can get with the Kubernetes integration
-Here's what you can do with GitLab if you enable the Kubernetes integration.
-### Deploy Boards **(PREMIUM)**
-GitLab's Deploy Boards offer a consolidated view of the current health and
-status of each CI [environment](../../../ci/environments.md) running on Kubernetes,
-displaying the status of the pods in the deployment. Developers and other
-teammates can view the progress and status of a rollout, pod by pod, in the
-workflow they already use without any need to access Kubernetes.
-[Read more about Deploy Boards](../deploy_boards.md)
-### Canary Deployments **(PREMIUM)**
-Leverage [Kubernetes' Canary deployments](https://kubernetes.io/docs/concepts/cluster-administration/manage-deployment/#canary-deployments)
-and visualize your canary deployments right inside the Deploy Board, without
-the need to leave GitLab.
-[Read more about Canary Deployments](../canary_deployments.md)
-### Pod logs **(ULTIMATE)**
-GitLab makes it easy to view the logs of running pods in connected Kubernetes clusters. By displaying the logs directly in GitLab, developers can avoid having to manage console tools or jump to a different interface.
-[Read more about Kubernetes pod logs](kubernetes_pod_logs.md)
-### Kubernetes monitoring
-Automatically detect and monitor Kubernetes metrics. Automatic monitoring of
-[NGINX ingress](../integrations/prometheus_library/nginx.md) is also supported.
-[Read more about Kubernetes monitoring](../integrations/prometheus_library/kubernetes.md)
-### Auto DevOps
-Auto DevOps automatically detects, builds, tests, deploys, and monitors your
-applications.
-To make full use of Auto DevOps(Auto Deploy, Auto Review Apps, and Auto Monitoring)
-you will need the Kubernetes project integration enabled.
-[Read more about Auto DevOps](../../../topics/autodevops/index.md)
-### Web terminals
-NOTE: **Note:**
-Introduced in GitLab 8.15. You must be the project owner or have `maintainer` permissions
-to use terminals. Support is limited to the first container in the
-first pod of your environment.
-When enabled, the Kubernetes service adds [web terminal](../../../ci/environments.md#web-terminals)
-support to your [environments](../../../ci/environments.md). This is based on the `exec` functionality found in
-Docker and Kubernetes, so you get a new shell session within your existing
-containers. To use this integration, you should deploy to Kubernetes using
-the deployment variables above, ensuring any pods you create are labelled with
-`app=$CI_ENVIRONMENT_SLUG`. GitLab will do the rest!
-### Integrating Amazon EKS cluster with GitLab
- Learn how to [connect and deploy to an Amazon EKS cluster](eks_and_gitlab/index.md).
-### Serverless
- [Run serverless workloads on Kubernetes with Knative.](serverless/index.md)
-[permissions]: ../../permissions.md
-[ee]: https://about.gitlab.com/pricing/
-[Auto DevOps]: ../../../topics/autodevops/index.md
--- 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 [GitLab's GKE integration](../index.md#adding-and-creating-a-new-gke-cluster-via-gitlab).
+    The simplest way to get started is to add a cluster using [GitLab's GKE integration](../index.md#add-new-gke-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 [Adding and creating a new GKE cluster via GitLab](../index.md#adding-and-creating-a-new-gke-cluster-via-gitlab)
+Follow the steps outlined in [Add new GKE cluster](../index.md#add-new-gke-cluster)
 to add a Kubernetes cluster to your project.
 ### 2. Install Helm Tiller, Ingress, and JupyterHub

--- a/doc/user/project/clusters/serverless/index.md
+++ b/doc/user/project/clusters/serverless/index.md
@@ -28,7 +28,7 @@ To run Knative on Gitlab, you will need:
   - If you are planning on deploying a serverless application, clone the sample [Knative Ruby App](https://gitlab.com/knative-examples/knative-ruby-app) to get started.
 1. **Kubernetes Cluster:** An RBAC-enabled Kubernetes cluster is required to deploy Knative.
-   The simplest way to get started is to add a cluster using [GitLab's GKE integration](../index.md#adding-and-creating-a-new-gke-cluster-via-gitlab).
+   The simplest way to get started is to add a cluster using [GitLab's GKE integration](../index.md#add-new-gke-cluster).
   The set of minimum recommended cluster specifications to run Knative is 3 nodes, 6 vCPUs, and 22.50 GB memory.
 1. **Helm Tiller:** Helm is a package manager for Kubernetes and is required to install
   Knative.
@@ -96,7 +96,8 @@ cluster which already has Knative installed.
 You must do the following:
 1. Follow the steps to
-   [add an existing Kubernetes cluster](../index.md#adding-an-existing-kubernetes-cluster).
+   [add an existing Kubernetes
+   cluster](../index.md#add-existing-kubernetes-cluster).
 1. Ensure GitLab can manage Knative:
   - For a non-GitLab managed cluster, ensure that the service account for the token