Commit 2c68448c authored by Phil Hughes's avatar Phil Hughes

Merge branch 'nagyv-gitlab-master-patch-46187' into 'master'

Clarify what a default configuration means

See merge request gitlab-org/gitlab!83758
parents a0fc5a94 65913e6c
......@@ -37,7 +37,7 @@ export default {
anchor: 'update-the-agent-version',
}),
configHelpLink: helpPagePath('user/clusters/agent/install/index', {
anchor: 'create-an-agent-without-configuration-file',
anchor: 'create-an-agent-configuration-file',
}),
inject: ['gitlabVersion'],
props: {
......
......@@ -31,7 +31,7 @@ export default {
EVENT_LABEL_MODAL,
enableKasPath: helpPagePath('administration/clusters/kas'),
registerAgentPath: helpPagePath('user/clusters/agent/install/index', {
anchor: 'register-an-agent-with-gitlab',
anchor: 'register-the-agent-with-gitlab',
}),
components: {
AvailableAgentsDropdown,
......
......@@ -69,6 +69,8 @@ Creating a file is optional but is needed if:
- You use [a GitOps workflow](../gitops.md#gitops-configuration-reference) and you want a more advanced configuration.
- You use a GitLab CI/CD workflow. In that workflow, you must [authorize the agent](../ci_cd_tunnel.md#authorize-the-agent).
If you do not create an agent configuration file, you can use the CI/CD workflow in the project where the agent is registered only.
To create an agent configuration file, go to the GitLab project. In the repository, create a file called `config.yaml` at this path:
```plaintext
......
......@@ -9,7 +9,7 @@ import timeagoMixin from '~/vue_shared/mixins/timeago';
import { clusterAgents, connectedTimeNow, connectedTimeInactive } from './mock_data';
const defaultConfigHelpUrl =
'/help/user/clusters/agent/install/index#create-an-agent-without-configuration-file';
'/help/user/clusters/agent/install/index#create-an-agent-configuration-file';
const provideData = {
gitlabVersion: '14.8',
......
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