Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

3 files changed, 44 insertions, 25 deletions

diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 7234bca8e12..78be67a5196 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -30,9 +30,12 @@ configuration. Automation enables consistency across your projects, seamless
 management of processes, and faster creation of new projects: push your code,
 and GitLab does the rest, improving your productivity and efficiency.
 
+<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
 For an introduction to Auto DevOps, watch [AutoDevOps in GitLab 11.0](https://youtu.be/0Tc0YYBxqi4).
 
-For requirements, see [Requirements for Auto DevOps](requirements.md) for more information.
+For requirements, read [Requirements for Auto DevOps](requirements.md) for more information.
+
+For a developer's guide, read [Auto DevOps development guide](../../development/auto_devops.md).
 
 ## Enabled by default
 
@@ -307,6 +310,11 @@ and verifying your application is deployed as a Review App in the Kubernetes
 cluster with the `review/*` environment scope. Similarly, you can check the
 other environments.
 
+[Cluster environment scope isn't respected](https://gitlab.com/gitlab-org/gitlab/-/issues/20351)
+when checking for active Kubernetes clusters. For multi-cluster setup to work with Auto DevOps,
+create a fallback cluster with **Cluster environment scope** set to `*`. A new cluster isn't
+required. You can use any of the clusters already added.
+
 ## Limitations
 
 The following restrictions apply.
@@ -481,7 +489,7 @@ that works for this problem. Follow these steps to use the tool in Auto DevOps:
 
 ### Error: error initializing: Looks like "https://kubernetes-charts.storage.googleapis.com" is not a valid chart repository or cannot be reached
 
-As [announced in the official CNCF blogpost](https://www.cncf.io/blog/2020/10/07/important-reminder-for-all-helm-users-stable-incubator-repos-are-deprecated-and-all-images-are-changing-location/),
+As [announced in the official CNCF blog post](https://www.cncf.io/blog/2020/10/07/important-reminder-for-all-helm-users-stable-incubator-repos-are-deprecated-and-all-images-are-changing-location/),
 the stable Helm chart repository was deprecated and removed on November 13th, 2020.
 You may encounter this error after that date.
 
@@ -526,7 +534,7 @@ To fix your custom chart:
    it's used to verify the integrity of the downloaded dependencies.
 
 You can find more information in
-[issue #263778, "Migrate PostgreSQL from stable Helm repo"](https://gitlab.com/gitlab-org/gitlab/-/issues/263778).
+[issue #263778, "Migrate PostgreSQL from stable Helm repository"](https://gitlab.com/gitlab-org/gitlab/-/issues/263778).
 
 ### Error: release .... failed: timed out waiting for the condition
 
@@ -545,7 +553,7 @@ page of the deployed application on port 5000. If your application isn't configu
 to serve anything at the root page, or is configured to run on a specific port
 *other* than 5000, this check fails.
 
-If it fails, you should see these failures within the events for the relevant
+If it fails, you should see these failures in the events for the relevant
 Kubernetes namespace. These events look like the following example:
 
 ```plaintext
diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md
index 5c3b296fdea..effdb4d7b75 100644
--- a/doc/topics/autodevops/quick_start_guide.md
+++ b/doc/topics/autodevops/quick_start_guide.md
@@ -25,7 +25,7 @@ Sign in with an existing Google account, such as the one you use to access Gmail
 or Google Drive, or create a new one.
 
 1. Follow the steps described in the ["Before you begin" section](https://cloud.google.com/kubernetes-engine/docs/quickstart#before-you-begin)
-   of the Kubernetes Engine docs to enable the required APIs and related services.
+   of the Kubernetes Engine documentation to enable the required APIs and related services.
 1. Ensure you've created a [billing account](https://cloud.google.com/billing/docs/how-to/manage-billing-account)
    with Google Cloud Platform.
 
@@ -101,30 +101,41 @@ to deploy this project to.
 After a couple of minutes, the cluster is created. You can also see its
 status on your [GCP dashboard](https://console.cloud.google.com/kubernetes).
 
-Next, install some applications on your cluster that are needed
-to take full advantage of Auto DevOps.
+## Install Ingress
 
-## Install Ingress and Prometheus
+After your cluster is running, you must install NGINX Ingress Controller as a
+load balancer, to route traffic from the internet to your application. Because
+you've created a Google GKE cluster in this guide, you can install NGINX Ingress Controller
+with Google Cloud Shell:
 
-After your cluster is running, you can install your first applications,
-Ingress and Prometheus:
+1. Go to your cluster's details page, and click the **Advanced Settings** tab.
+1. Click the link to Google Kubernetes Engine to visit the cluster on Google Cloud Console.
+1. On the GKE cluster page, select **Connect**, then click **Run in Cloud Shell**.
+1. After the Cloud Shell starts, run these commands to install NGINX Ingress Controller:
 
-- Ingress - Provides load balancing, SSL termination, and name-based virtual hosting,
-  using NGINX behind the scenes.
-- Prometheus - An open-source monitoring and alerting system used to supervise the
-  deployed application.
+   ```shell
+   helm repo add nginx-stable https://helm.nginx.com/stable
+   helm repo update
+   helm install nginx-ingress nginx-stable/nginx-ingress
 
-We aren't installing GitLab Runner in this quick start guide, as this guide uses the
-shared runners provided by GitLab.com.
+   # Check that the ingress controller is installed successfully
+   kubectl get service nginx-ingress-nginx-ingress
+   ```
+
+1. A few minutes after you install NGINX, the load balancer obtains an IP address, and you can
+   get the external IP address with this command:
+
+   ```shell
+   kubectl get service nginx-ingress-nginx-ingress -ojson | jq -r '.status.loadBalancer.ingress[].ip'
+   ```
 
-To install the applications:
+   Copy this IP address, as you need it in the next step.
 
-- Click the **Install** button for **Ingress**.
-- When the **Ingress Endpoint** is displayed, copy the IP address.
-- Add your **Base domain**. For this guide, use the domain suggested by GitLab.
-- Click **Save changes**.
+1. Go back to the cluster page on GitLab, and go to the **Details** tab.
+   - Add your **Base domain**. For this guide, use the domain `<IP address>.nip.io`.
+   - Click **Save changes**.
 
-![Cluster Base Domain](img/guide_base_domain_v12_3.png)
+   ![Cluster Base Domain](img/guide_base_domain_v12_3.png)
 
 ## Enable Auto DevOps (optional)
 
@@ -290,7 +301,7 @@ and then deploys the application to production.
 
 After implementing this project, you should have a solid understanding of the basics of Auto DevOps.
 You started from building and testing, to deploying and monitoring an application
-all within GitLab. Despite its automatic nature, Auto DevOps can also be configured
+all in GitLab. Despite its automatic nature, Auto DevOps can also be configured
 and customized to fit your workflow. Here are some helpful resources for further reading:
 
 1. [Auto DevOps](index.md)
diff --git a/doc/topics/autodevops/upgrading_auto_deploy_dependencies.md b/doc/topics/autodevops/upgrading_auto_deploy_dependencies.md
index c45390e935d..663060bf59d 100644
--- a/doc/topics/autodevops/upgrading_auto_deploy_dependencies.md
+++ b/doc/topics/autodevops/upgrading_auto_deploy_dependencies.md
@@ -161,7 +161,7 @@ For example, if the template is bundled in GitLab v13.3, change your `.gitlab-ci
 ```yaml
 include:
   - template: Auto-DevOps.gitlab-ci.yml
-  - remote: https://gitlab.com/gitlab-org/gitlab/-/blob/v13.3.0-ee/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+  - remote: https://gitlab.com/gitlab-org/gitlab/-/raw/v13.3.0-ee/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
 ```
 
 ### Ignore warnings and continue deploying
@@ -181,7 +181,7 @@ the latest Auto Deploy template into your `.gitlab-ci.yml`:
 ```yaml
 include:
   - template: Auto-DevOps.gitlab-ci.yml
-  - remote: https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
+  - remote: https://gitlab.com/gitlab-org/gitlab/-/raw/master/lib/gitlab/ci/templates/Jobs/Deploy.latest.gitlab-ci.yml
 ```
 
 WARNING: