Commit 43694751 authored by Russell Dickenson's avatar Russell Dickenson

Merge branch 'docs-configure-nav-changes' into 'master'

Menu item change in Configure docs

See merge request gitlab-org/gitlab!64134
parents 145b8d2d acb08987
...@@ -286,14 +286,14 @@ The following table is an example of how to configure the three different cluste ...@@ -286,14 +286,14 @@ The following table is an example of how to configure the three different cluste
To add a different cluster for each environment: To add a different cluster for each environment:
1. Navigate to your project's **Operations > Kubernetes**. 1. Navigate to your project's **Infrastructure > Kubernetes clusters**.
1. Create the Kubernetes clusters with their respective environment scope, as 1. Create the Kubernetes clusters with their respective environment scope, as
described from the table above. described from the table above.
1. After creating the clusters, navigate to each cluster and [install 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. 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 1. Make sure you've [configured your DNS](#auto-devops-base-domain) with the
specified Auto DevOps domains. specified Auto DevOps domains.
1. Navigate to each cluster's page, through **Operations > Kubernetes**, 1. Navigate to each cluster's page, through **Infrastructure > Kubernetes clusters**,
and add the domain based on its Ingress IP address. and add the domain based on its Ingress IP address.
After completing configuration, you can test your setup by creating a merge request After completing configuration, you can test your setup by creating a merge request
......
...@@ -63,7 +63,8 @@ to deploy this project to. ...@@ -63,7 +63,8 @@ to deploy this project to.
## Create a Kubernetes cluster from within GitLab ## Create a Kubernetes cluster from within GitLab
1. On your project's landing page, click **Add Kubernetes cluster** 1. On your project's landing page, click **Add Kubernetes cluster**
(note that this option is also available when you navigate to **Operations > Kubernetes**). (note that this option is also available when you navigate to
**Infrastructure > Kubernetes clusters**).
![Project landing page](img/guide_project_landing_page_v12_10.png) ![Project landing page](img/guide_project_landing_page_v12_10.png)
...@@ -216,7 +217,7 @@ to monitor it. ...@@ -216,7 +217,7 @@ to monitor it.
After successfully deploying your application, you can view its website and check After successfully deploying your application, you can view its website and check
on its health on the **Environments** page by navigating to on its health on the **Environments** page by navigating to
**Operations > Environments**. This page displays details about **Deployments > Environments**. This page displays details about
the deployed applications, and the right-hand column displays icons that link the deployed applications, and the right-hand column displays icons that link
you to common environment tasks: you to common environment tasks:
......
...@@ -486,7 +486,7 @@ cilium: ...@@ -486,7 +486,7 @@ cilium:
## Management interfaces ## Management interfaces
Users with at least the [Developer](../../permissions.md) can access the user interface Users with at least the [Developer](../../permissions.md) can access the user interface
for the GitLab Kubernetes agent at **Operations > Kubernetes** under the for the GitLab Kubernetes agent at **Infrastructure > Kubernetes clusters**, under the
**GitLab Agent managed clusters** tab. This page lists all registered agents for **GitLab Agent managed clusters** tab. This page lists all registered agents for
the current project, and the configuration directory for each agent: the current project, and the configuration directory for each agent:
......
...@@ -454,7 +454,7 @@ for the available configuration options. ...@@ -454,7 +454,7 @@ for the available configuration options.
You can check Cilium's installation status on the cluster management page: You can check Cilium's installation status on the cluster management page:
- [Project-level cluster](../project/clusters/index.md): Navigate to your project's - [Project-level cluster](../project/clusters/index.md): Navigate to your project's
**Operations > Kubernetes** page. **Infrastructure > Kubernetes clusters** page.
- [Group-level cluster](../group/clusters/index.md): Navigate to your group's - [Group-level cluster](../group/clusters/index.md): Navigate to your group's
**Kubernetes** page. **Kubernetes** page.
...@@ -1054,8 +1054,8 @@ Logs produced by pods running **GitLab Managed Apps** can be browsed using ...@@ -1054,8 +1054,8 @@ Logs produced by pods running **GitLab Managed Apps** can be browsed using
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/327803) in GitLab 13.12. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/327803) in GitLab 13.12.
With the removal of the One-click install method in GitLab 14.0, With the removal of the One-click install method in GitLab 14.0,
the **Applications** tab (under your project's **Operations > Kubernetes**) the **Applications** tab (under your project's **Infrastructure > Kubernetes clusters**)
will no longer be displayed: is no longer displayed:
![GitLab Managed Apps - Applications tab](img/applications_tab_v13_12.png) ![GitLab Managed Apps - Applications tab](img/applications_tab_v13_12.png)
......
...@@ -46,7 +46,7 @@ permissions in a project or group. ...@@ -46,7 +46,7 @@ permissions in a project or group.
kubectl apply -f kubernetes/ --namespace cost-model kubectl apply -f kubernetes/ --namespace cost-model
``` ```
To access the cost insights, navigate to **Operations > Metrics** and select To access the cost insights, navigate to **Monitor > Metrics** and select
the `default_costs.yml` dashboard. You can [customize](#customize-the-cost-dashboard) the `default_costs.yml` dashboard. You can [customize](#customize-the-cost-dashboard)
this dashboard. this dashboard.
......
...@@ -73,7 +73,7 @@ To enable the Prometheus integration for your cluster: ...@@ -73,7 +73,7 @@ To enable the Prometheus integration for your cluster:
1. Go to the cluster's page: 1. Go to the cluster's page:
- For a [project-level cluster](../project/clusters/index.md), navigate to your project's - For a [project-level cluster](../project/clusters/index.md), navigate to your project's
**Operations > Kubernetes**. **Infrastructure > Kubernetes clusters**.
- For a [group-level cluster](../group/clusters/index.md), navigate to your group's - For a [group-level cluster](../group/clusters/index.md), navigate to your group's
**Kubernetes** page. **Kubernetes** page.
- For an [instance-level cluster](../instance/clusters/index.md), navigate to your instance's - For an [instance-level cluster](../instance/clusters/index.md), navigate to your instance's
...@@ -128,7 +128,7 @@ To enable the Elastic Stack integration for your cluster: ...@@ -128,7 +128,7 @@ To enable the Elastic Stack integration for your cluster:
1. Go to the cluster's page: 1. Go to the cluster's page:
- For a [project-level cluster](../project/clusters/index.md), navigate to your project's - For a [project-level cluster](../project/clusters/index.md), navigate to your project's
**Operations > Kubernetes**. **Infrastructure > Kubernetes clusters**.
- For a [group-level cluster](../group/clusters/index.md), navigate to your group's - For a [group-level cluster](../group/clusters/index.md), navigate to your group's
**Kubernetes** page. **Kubernetes** page.
- For an [instance-level cluster](../instance/clusters/index.md), navigate to your instance's - For an [instance-level cluster](../instance/clusters/index.md), navigate to your instance's
......
...@@ -46,7 +46,7 @@ To select a cluster management project to use: ...@@ -46,7 +46,7 @@ To select a cluster management project to use:
1. Navigate to the appropriate configuration page. For a: 1. Navigate to the appropriate configuration page. For a:
- [Project-level cluster](../project/clusters/index.md), navigate to your project's - [Project-level cluster](../project/clusters/index.md), navigate to your project's
**Operations > Kubernetes** page. **Infrastructure > Kubernetes clusters** page.
- [Group-level cluster](../group/clusters/index.md), navigate to your group's **Kubernetes** - [Group-level cluster](../group/clusters/index.md), navigate to your group's **Kubernetes**
page. page.
- [Instance-level cluster](../instance/clusters/index.md), navigate to Admin Area's **Kubernetes** - [Instance-level cluster](../instance/clusters/index.md), navigate to Admin Area's **Kubernetes**
......
...@@ -41,7 +41,8 @@ To get started with a GitLab-managed Terraform state, there are two different op ...@@ -41,7 +41,8 @@ To get started with a GitLab-managed Terraform state, there are two different op
- [Use a local machine](#get-started-using-local-development). - [Use a local machine](#get-started-using-local-development).
- [Use GitLab CI](#get-started-using-gitlab-ci). - [Use GitLab CI](#get-started-using-gitlab-ci).
Terraform States can be found by navigating to a Project's **{cloud-gear}** **Operations > Terraform** page. Terraform States can be found by navigating to a Project's
**{cloud-gear}** **Infrastructure > Terraform** page.
### Get started using local development ### Get started using local development
...@@ -351,7 +352,7 @@ location. You can then go back to running it in GitLab CI/CD. ...@@ -351,7 +352,7 @@ location. You can then go back to running it in GitLab CI/CD.
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/273592) in GitLab 13.8. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/273592) in GitLab 13.8.
Users with Developer and greater [permissions](../permissions.md) can view the Users with Developer and greater [permissions](../permissions.md) can view the
state files attached to a project at **Operations > Terraform**. Users with the state files attached to a project at **Infrastructure > Terraform**. Users with the
Maintainer role can perform commands on the state files. The user interface Maintainer role can perform commands on the state files. The user interface
contains these fields: contains these fields:
...@@ -376,7 +377,7 @@ are planned. ...@@ -376,7 +377,7 @@ are planned.
Users with Maintainer and greater [permissions](../permissions.md) can use the Users with Maintainer and greater [permissions](../permissions.md) can use the
following options to remove a state file: following options to remove a state file:
- **GitLab UI**: Go to **Operations > Terraform**. In the **Actions** column, - **GitLab UI**: Go to **Infrastructure > Terraform**. In the **Actions** column,
click the vertical ellipsis (**{ellipsis_v}**) button and select click the vertical ellipsis (**{ellipsis_v}**) button and select
**Remove state file and versions**. **Remove state file and versions**.
- **GitLab REST API**: You can remove a state file by making a request to the - **GitLab REST API**: You can remove a state file by making a request to the
......
...@@ -74,7 +74,7 @@ Instance profiles dynamically retrieve temporary credentials from AWS when neede ...@@ -74,7 +74,7 @@ Instance profiles dynamically retrieve temporary credentials from AWS when neede
To create and add a new Kubernetes cluster to your project, group, or instance: To create and add a new Kubernetes cluster to your project, group, or instance:
1. Navigate to your: 1. Navigate to your:
- Project's **Operations > Kubernetes** page, for a project-level cluster. - Project's **Infrastructure > Kubernetes clusters** page, for a project-level cluster.
- Group's **Kubernetes** page, for a group-level cluster. - Group's **Kubernetes** page, for a group-level cluster.
- **Admin Area > Kubernetes**, for an instance-level cluster. - **Admin Area > Kubernetes**, for an instance-level cluster.
1. Click **Integrate with a cluster certificate**. 1. Click **Integrate with a cluster certificate**.
......
...@@ -46,7 +46,8 @@ Note the following: ...@@ -46,7 +46,8 @@ Note the following:
To create and add a new Kubernetes cluster to your project, group, or instance: To create and add a new Kubernetes cluster to your project, group, or instance:
1. Navigate to your: 1. Navigate to your:
- Project's **{cloud-gear}** **Operations > Kubernetes** page, for a project-level cluster. - Project's **{cloud-gear}** **Infrastructure > Kubernetes clusters** page, for a project-level
cluster.
- Group's **{cloud-gear}** **Kubernetes** page, for a group-level cluster. - Group's **{cloud-gear}** **Kubernetes** page, for a group-level cluster.
- **Admin Area >** **{cloud-gear}** **Kubernetes** page, for an instance-level cluster. - **Admin Area >** **{cloud-gear}** **Kubernetes** page, for an instance-level cluster.
1. Click **Integrate with a cluster certificate**. 1. Click **Integrate with a cluster certificate**.
......
...@@ -144,7 +144,8 @@ New clusters can be created using GitLab on Google Kubernetes Engine (GKE) or ...@@ -144,7 +144,8 @@ New clusters can be created using GitLab on Google Kubernetes Engine (GKE) or
Amazon Elastic Kubernetes Service (EKS) at the project, group, or instance level: Amazon Elastic Kubernetes Service (EKS) at the project, group, or instance level:
1. Navigate to your: 1. Navigate to your:
- Project's **{cloud-gear}** **Operations > Kubernetes** page, for a project-level cluster. - Project's **{cloud-gear}** **Infrastructure > Kubernetes clusters** page, for a project-level
cluster.
- Group's **{cloud-gear}** **Kubernetes** page, for a group-level cluster. - Group's **{cloud-gear}** **Kubernetes** page, for a group-level cluster.
- **Admin Area >** **{cloud-gear}** **Kubernetes** page, for an instance-level cluster. - **Admin Area >** **{cloud-gear}** **Kubernetes** page, for an instance-level cluster.
1. Click **Integrate with a cluster certificate**. 1. Click **Integrate with a cluster certificate**.
...@@ -173,7 +174,8 @@ or start [deploying right away](index.md#deploying-to-a-kubernetes-cluster). ...@@ -173,7 +174,8 @@ or start [deploying right away](index.md#deploying-to-a-kubernetes-cluster).
To add a Kubernetes cluster to your project, group, or instance: To add a Kubernetes cluster to your project, group, or instance:
1. Navigate to your: 1. Navigate to your:
1. Project's **{cloud-gear}** **Operations > Kubernetes** page, for a project-level cluster. 1. Project's **{cloud-gear}** **Infrastructure > Kubernetes clusters** page, for a project-level
cluster.
1. Group's **{cloud-gear}** **Kubernetes** page, for a group-level cluster. 1. Group's **{cloud-gear}** **Kubernetes** page, for a group-level cluster.
1. **Admin Area >** **{cloud-gear}** **Kubernetes** page, for an instance-level cluster. 1. **Admin Area >** **{cloud-gear}** **Kubernetes** page, for an instance-level cluster.
1. Click **Add Kubernetes cluster**. 1. Click **Add Kubernetes cluster**.
...@@ -350,7 +352,8 @@ The Kubernetes cluster integration enables after you have successfully either cr ...@@ -350,7 +352,8 @@ The Kubernetes cluster integration enables after you have successfully either cr
a new cluster or added an existing one. To disable Kubernetes cluster integration: a new cluster or added an existing one. To disable Kubernetes cluster integration:
1. Navigate to your: 1. Navigate to your:
- Project's **{cloud-gear}** **Operations > Kubernetes** page, for a project-level cluster. - Project's **{cloud-gear}** **Infrastructure > Kubernetes clusters** page, for a project-level
cluster.
- Group's **{cloud-gear}** **Kubernetes** page, for a group-level cluster. - Group's **{cloud-gear}** **Kubernetes** page, for a group-level cluster.
- **Admin Area >** **{cloud-gear}** **Kubernetes** page, for an instance-level cluster. - **Admin Area >** **{cloud-gear}** **Kubernetes** page, for an instance-level cluster.
1. Click on the name of the cluster. 1. Click on the name of the cluster.
......
...@@ -320,7 +320,7 @@ After the `gitlab-ci.yml` template has been added and the `serverless.yml` file ...@@ -320,7 +320,7 @@ After the `gitlab-ci.yml` template has been added and the `serverless.yml` file
has been created, pushing a commit to your project results in a CI pipeline has been created, pushing a commit to your project results in a CI pipeline
being executed which deploys each function as a Knative service. After the being executed which deploys each function as a Knative service. After the
deploy stage has finished, additional details for the function display deploy stage has finished, additional details for the function display
under **Operations > Serverless**. under **Infrastructure > Serverless platform**.
![serverless page](img/serverless-page.png) ![serverless page](img/serverless-page.png)
...@@ -454,7 +454,7 @@ With all the pieces in place, the next time a CI pipeline runs the Knative appli ...@@ -454,7 +454,7 @@ With all the pieces in place, the next time a CI pipeline runs the Knative appli
### Function details ### Function details
Go to the **Operations > Serverless** page to see the final URL of your functions. Go to the **Infrastructure > Serverless platform** page to see the final URL of your functions.
![function_details](img/function-list_v12_7.png) ![function_details](img/function-list_v12_7.png)
...@@ -579,7 +579,7 @@ or with other versions of Python. ...@@ -579,7 +579,7 @@ or with other versions of Python.
Where `<namespace>` is the namespace created by GitLab for your serverless project (composed of `<project_name>-<project_id>-<environment>`) and Where `<namespace>` is the namespace created by GitLab for your serverless project (composed of `<project_name>-<project_id>-<environment>`) and
`example.com` is the domain being used for your project. If you are unsure what the namespace of your project is, navigate `example.com` is the domain being used for your project. If you are unsure what the namespace of your project is, navigate
to the **Operations > Serverless** page of your project and inspect to the **Infrastructure > Serverless platform** page of your project and inspect
the endpoint provided for your function/app. the endpoint provided for your function/app.
![function_endpoint](img/function-endpoint.png) ![function_endpoint](img/function-endpoint.png)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment