Merge branch 'jcunha/update-recommended-way-to-install-ingress-docs' into 'master'

Update ADO docs on how to install ingress

See merge request gitlab-org/gitlab!63908

doc/topics/autodevops/index.md

@@ -289,8 +289,8 @@ To add a different cluster for each environment:
 1. Navigate to your project's **Operations > Kubernetes**.
 1. Create the Kubernetes clusters with their respective environment scope, as
    described from the table above.
-1. After creating the clusters, navigate to each cluster and install
-   Ingress. Wait for the Ingress IP address to be assigned.
+1. After creating the clusters, navigate to each cluster and [install
+   Ingress](quick_start_guide.md#install-ingress). Wait for the Ingress IP address to be assigned.
 1. Make sure you've [configured your DNS](#auto-devops-base-domain) with the
    specified Auto DevOps domains.
 1. Navigate to each cluster's page, through **Operations > Kubernetes**,

doc/topics/autodevops/quick_start_guide.md

@@ -106,7 +106,8 @@ status on your [GCP dashboard](https://console.cloud.google.com/kubernetes).
 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:
+through the GitLab [Cluster management project template](../../user/clusters/management_project_template.md),
+or manually with Google Cloud Shell:
 
 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.
@@ -114,21 +115,28 @@ with Google Cloud Shell:
 1. After the Cloud Shell starts, run these commands to install NGINX Ingress Controller:
 
    ```shell
-   helm repo add nginx-stable https://helm.nginx.com/stable
+   kubectl create ns gitlab-managed-apps
+   helm repo add stable https://charts.helm.sh/stable
    helm repo update
-   helm install nginx-ingress nginx-stable/nginx-ingress
+   helm install ingress stable/nginx-ingress -n gitlab-managed-apps
 
    # Check that the ingress controller is installed successfully
-   kubectl get service nginx-ingress-nginx-ingress
+   kubectl get service ingress-nginx-ingress-controller -n gitlab-managed-apps
    ```
 
-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:
+## Configure your base domain
+
+Follow these steps to configure the Base Domain where your apps will be accessible.
 
+1. A few minutes after you install NGINX, the load balancer obtains an IP address, and you can
+   get the external IP address with the following command:
+   
    ```shell
-   kubectl get service nginx-ingress-nginx-ingress -ojson | jq -r '.status.loadBalancer.ingress[].ip'
+   kubectl get service ingress-nginx-ingress-controller -n gitlab-managed-apps -ojson | jq -r '.status.loadBalancer.ingress[].ip'
    ```
 
+   Replace `gitlab-managed-apps` if you have overwritten your namespace.
+
    Copy this IP address, as you need it in the next step.
 
 1. Go back to the cluster page on GitLab, and go to the **Details** tab.

doc/topics/autodevops/requirements.md

@@ -30,8 +30,8 @@ To make full use of Auto DevOps with Kubernetes, you need:
      deployments, any Ingress controller should work, but as of GitLab 14.0,
      [canary deployments](../../user/project/canary_deployments.md) require
      NGINX Ingress. You can deploy the NGINX Ingress controller to your
-     Kubernetes cluster by installing the
-     [`ingress-nginx`](https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx)
+     Kubernetes cluster either through the GitLab [Cluster management project template](../../user/clusters/management_project_template.md)
+     or manually by using the [`ingress-nginx`](https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx)
      Helm chart.
 
      NOTE:

doc/user/clusters/applications.md

@@ -1029,7 +1029,13 @@ at least 2 people from the
 The one-click installation method was deprecated in GitLab 13.9 and removed in [GitLab 14.0](https://gitlab.com/groups/gitlab-org/-/epics/4280).
 The removal does not break nor uninstall any apps you have installed, it only
 removes the "Applications" tab from the cluster page.
-Follow the process to [take ownership of your GitLab Managed Apps](#take-ownership-of-your-gitlab-managed-apps).
+The new recommended way to manage cluster applications is to use the [cluster management project template](management_project_template.md).
+
+- If you want to migrate your GitLab managed apps management to this template, read
+  [migrating from GitLab managed apps to project template](migrating_from_gma_to_project_template.md).
+- If you don't want to use the template, you can also manually manage your applications.
+  For that, follow the process to
+  [take ownership of your GitLab Managed Apps](#take-ownership-of-your-gitlab-managed-apps).
 
 If you are not yet on GitLab 14.0 or later, you can refer to [an older version of this document](https://docs.gitlab.com/13.12/ee/user/clusters/applications.html#install-with-one-click-deprecated).