Merge branch 'auto-devops-manual-ingress' into 'master'

Switch from GMA installed ingress to manual install

See merge request gitlab-org/gitlab!50420

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)