Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

4 files changed, 16 insertions, 6 deletions

diff --git a/doc/user/clusters/agent/ci_cd_workflow.md b/doc/user/clusters/agent/ci_cd_workflow.md
index 2a66549f9cb..304bbaee256 100644
--- a/doc/user/clusters/agent/ci_cd_workflow.md
+++ b/doc/user/clusters/agent/ci_cd_workflow.md
@@ -141,7 +141,7 @@ deploy:
 
 You can assign different agents to separate Auto DevOps jobs. For instance,
 Auto DevOps can use one agent for `staging` jobs, and another agent for `production` jobs.
-To use multiple agents, define an [environment-scoped CI/CD variable](../../../ci/variables/index.md#limit-the-environment-scope-of-a-cicd-variable)
+To use multiple agents, define an [environment-scoped CI/CD variable](../../../ci/environments/index.md#limit-the-environment-scope-of-a-cicd-variable)
 for each agent. For example:
 
 1. Define two variables named `KUBE_CONTEXT`.
diff --git a/doc/user/clusters/agent/troubleshooting.md b/doc/user/clusters/agent/troubleshooting.md
index 6b5f58f8f76..a44d1e9685b 100644
--- a/doc/user/clusters/agent/troubleshooting.md
+++ b/doc/user/clusters/agent/troubleshooting.md
@@ -229,3 +229,13 @@ This error occurs when the GitLab agent tries to update an object and the object
 - Add the required annotations manually.
 - Delete the object and let the agent recreate it.
 - Change your [`inventory_policy`](../../infrastructure/clusters/deploy/inventory_object.md#inventory_policy-options) setting.
+
+## Parse error during installation
+
+When you install the agent, you might encounter an error that states:
+
+```shell
+Error: parse error at (gitlab-agent/templates/observability-secret.yaml:1): unclosed action
+```
+
+This error is typically caused by an incompatible version of Helm. To resolve the issue, ensure that you are using a version of Helm [compatible with your version of Kubernetes](index.md#supported-cluster-versions).
diff --git a/doc/user/clusters/agent/vulnerabilities.md b/doc/user/clusters/agent/vulnerabilities.md
index d9a9981d211..37d742e2b08 100644
--- a/doc/user/clusters/agent/vulnerabilities.md
+++ b/doc/user/clusters/agent/vulnerabilities.md
@@ -84,9 +84,9 @@ Here is an example of a policy which enables operational container scanning with
 
 The keys for a schedule rule are:
 
-- cadence (required): a [CRON expression](https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm) for when the scans will be run
-- agents:<agent-name> (required): The name of the agent to use for scanning
-- agents:<agent-name>:namespaces (optional): The Kubernetes namespaces to scan. If omitted, all namespaces will be scanned
+- `cadence` (required): a [CRON expression](https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm) for when the scans will be run
+- `agents:<agent-name>` (required): The name of the agent to use for scanning
+- `agents:<agent-name>:namespaces` (optional): The Kubernetes namespaces to scan. If omitted, all namespaces will be scanned
 
 NOTE:
 Other elements of the [CRON syntax](https://docs.oracle.com/cd/E12058_01/doc/doc.1014/e12030/cron_expressions.htm) may work in the cadence field if supported by the [cron](https://github.com/robfig/cron) we are using in our implementation, however, GitLab does not officially test or support them.
diff --git a/doc/user/clusters/management_project_template.md b/doc/user/clusters/management_project_template.md
index a8d874ed608..6f7fdc46ad4 100644
--- a/doc/user/clusters/management_project_template.md
+++ b/doc/user/clusters/management_project_template.md
@@ -25,7 +25,7 @@ If you **have not yet** used the agent to connect your cluster with GitLab:
 1. [Create a project from the cluster management project template](#create-a-project-based-on-the-cluster-management-project-template).
 1. [Configure the project for the agent](agent/install/index.md).
 1. In your project's settings, create an
-   [environment variable](../../ci/variables/index.md#add-a-cicd-variable-to-a-project) named `$KUBE_CONTEXT`
+   [environment variable](../../ci/variables/index.md#for-a-project) named `$KUBE_CONTEXT`
    and set the value to `path/to/agent-configuration-project:your-agent-name`.
 1. [Configure the files](#configure-the-project) as needed.
 
@@ -37,7 +37,7 @@ If you have already configured the agent and connected a cluster with GitLab:
 1. In the project where you configured your agent,
    [grant the agent access to the new project](agent/ci_cd_workflow.md#authorize-the-agent).
 1. In the new project, create an
-   [environment variable](../../ci/variables/index.md#add-a-cicd-variable-to-a-project) named `$KUBE_CONTEXT`
+   [environment variable](../../ci/variables/index.md#for-a-project) named `$KUBE_CONTEXT`
    and set the value to `path/to/agent-configuration-project:your-agent-name`.
 1. In the new project, [configure the files](#configure-the-project) as needed.