Skip to content
代码片段 群组 项目
提交 4f11d053 编辑于 作者: Lorena Ciutacu's avatar Lorena Ciutacu
浏览文件

Merge branch 'agent-config' into 'master'

Improve GitLab agent configuration docs

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138626



Merged-by: default avatarLorena Ciutacu <lciutacu@gitlab.com>
Approved-by: default avatarLorena Ciutacu <lciutacu@gitlab.com>
Co-authored-by: default avatarAshraf Khamis <akhamis@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -30,12 +30,7 @@ which you can customize to meet the specific needs of each project. ...@@ -30,12 +30,7 @@ which you can customize to meet the specific needs of each project.
that controller accessible over a domain. For example, point `*.workspaces.example.dev` that controller accessible over a domain. For example, point `*.workspaces.example.dev`
and `workspaces.example.dev` to the load balancer exposed by the Ingress controller. and `workspaces.example.dev` to the load balancer exposed by the Ingress controller.
- [Install `gitlab-workspaces-proxy`](https://gitlab.com/gitlab-org/remote-development/gitlab-workspaces-proxy#installation-instructions). - [Install `gitlab-workspaces-proxy`](https://gitlab.com/gitlab-org/remote-development/gitlab-workspaces-proxy#installation-instructions).
- [Install the GitLab agent](../clusters/agent/install/index.md). - [Install](../clusters/agent/install/index.md) and [configure](gitlab_agent_configuration.md) the GitLab agent.
- Configure [remote development settings for the GitLab agent](gitlab_agent_configuration.md).
You can use any agent defined under the root group of your project,
provided that remote development is properly configured for that agent.
- You must have at least the Developer role in the root group. - You must have at least the Developer role in the root group.
- In each project you want to use this feature for, create a [devfile](index.md#devfile): - In each project you want to use this feature for, create a [devfile](index.md#devfile):
1. On the left sidebar, select **Search or go to** and find your project. 1. On the left sidebar, select **Search or go to** and find your project.
......
...@@ -7,8 +7,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -7,8 +7,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# GitLab agent configuration # GitLab agent configuration
When you [set up a workspace](configuration.md#set-up-a-workspace), When you [set up a workspace](configuration.md#set-up-a-workspace),
you must configure remote development settings for the GitLab agent. you must configure remote development for the GitLab agent.
These settings are available in the agent configuration file under `remote_development`. The remote development settings are available in the agent
configuration file under `remote_development`.
You can use any agent defined under the root group of your project, You can use any agent defined under the root group of your project,
provided that remote development is properly configured for that agent. provided that remote development is properly configured for that agent.
...@@ -23,7 +24,7 @@ provided that remote development is properly configured for that agent. ...@@ -23,7 +24,7 @@ provided that remote development is properly configured for that agent.
| [`network_policy`](#network_policy) | Firewall rules for workspaces | | [`network_policy`](#network_policy) | Firewall rules for workspaces |
NOTE: NOTE:
If any setting has an invalid value, all settings cannot be updated until you fix that value. If a setting has an invalid value, it's not possible to update any setting until you fix that value.
### `enabled` ### `enabled`
...@@ -109,12 +110,12 @@ Use this setting to define a list of IP CIDR ranges to allow as egress destinati ...@@ -109,12 +110,12 @@ Use this setting to define a list of IP CIDR ranges to allow as egress destinati
Define egress rules when: Define egress rules when:
- The GitLab instance is available on a private IP. - The GitLab instance is on a private IP range.
- Workspace users must access a cloud resource available on a private IP. - Workspace users must access a cloud resource on a private IP range.
Each element of the list defines an `allow` attribute with an optional `except` attribute. Each element of the list defines an `allow` attribute with an optional `except` attribute.
The `allow` attribute defines an IP CIDR range to allow traffic from. `allow` defines an IP range to allow traffic from.
The `except` attribute lists IP CIDR ranges to exclude from the `allow` range. `except` lists IP ranges to exclude from the `allow` range.
**Example configuration:** **Example configuration:**
...@@ -132,5 +133,5 @@ remote_development: ...@@ -132,5 +133,5 @@ remote_development:
In this example, traffic from the workspace is allowed if: In this example, traffic from the workspace is allowed if:
- The destination IP is any IP except `10.0.0.0/8`, `172.16.0.0/12`, or `192.168.0.0/16`. - The destination IP is any range except `10.0.0.0/8`, `172.16.0.0/12`, or `192.168.0.0/16`.
- The destination IP is `172.16.123.1/32`. - The destination IP is `172.16.123.1/32`.
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册