diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 21:09:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 21:09:05 +0300 |
commit | 20a86e7f6fd58882025b1c85b21e891d75220da5 (patch) | |
tree | 31d400a3790b2b3650415e5caf1cabfbe8d9092e /doc/api/geo_sites.md | |
parent | 04ac4180cb5ba0df460034c7e64862056fd498b3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api/geo_sites.md')
-rw-r--r-- | doc/api/geo_sites.md | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/doc/api/geo_sites.md b/doc/api/geo_sites.md index 3570706c016..40410cdf540 100644 --- a/doc/api/geo_sites.md +++ b/doc/api/geo_sites.md @@ -66,9 +66,7 @@ Example response: "selective_sync_namespace_ids": [1, 25], "minimum_reverification_interval": 7, "sync_object_storage": false, - "clone_protocol": "http", "web_edit_url": "https://primary.example.com/admin/geo/sites/3/edit", - "web_geo_projects_url": "https://secondary.example.com/admin/geo/projects", "web_geo_replication_details_url": "https://secondary.example.com/admin/geo/sites/3/replication/lfs_objects", "_links": { "self": "https://primary.example.com/api/v4/geo_sites/3", @@ -78,10 +76,6 @@ Example response: } ``` -NOTE: -The `web_geo_projects_url` attribute is in its end-of-life process. It was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80106) -in GitLab 14.9. - ## Retrieve configuration about all Geo sites ```plaintext @@ -112,7 +106,6 @@ Example response: "selective_sync_shards": [], "selective_sync_namespace_ids": [1, 25], "minimum_reverification_interval": 7, - "clone_protocol": "http", "web_edit_url": "https://primary.example.com/admin/geo/sites/1/edit", "_links": { "self": "https://primary.example.com/api/v4/geo_sites/1", @@ -137,9 +130,7 @@ Example response: "selective_sync_namespace_ids": [1, 25], "minimum_reverification_interval": 7, "sync_object_storage": true, - "clone_protocol": "http", "web_edit_url": "https://primary.example.com/admin/geo/sites/2/edit", - "web_geo_projects_url": "https://secondary.example.com/admin/geo/projects", "web_geo_replication_details_url": "https://secondary.example.com/admin/geo/sites/2/replication/lfs_objects", "_links": { "self":"https://primary.example.com/api/v4/geo_sites/2", @@ -150,10 +141,6 @@ Example response: ] ``` -NOTE: -The `web_geo_projects_url` attribute is in its end-of-life process. It was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80106) -in GitLab 14.9. - ## Retrieve configuration about a specific Geo site ```plaintext @@ -183,7 +170,6 @@ Example response: "selective_sync_shards": [], "selective_sync_namespace_ids": [1, 25], "minimum_reverification_interval": 7, - "clone_protocol": "http", "web_edit_url": "https://primary.example.com/admin/geo/sites/1/edit", "_links": { "self": "https://primary.example.com/api/v4/geo_sites/1", @@ -212,7 +198,6 @@ PUT /geo_sites/:id | `repos_max_capacity` | integer | no | Control the maximum concurrency of repository backfill for this secondary site. | | `verification_max_capacity` | integer | no | Control the maximum concurrency of verification for this site. | | `container_repositories_max_capacity` | integer | no | Control the maximum concurrency of container repository sync for this site. | -| `sync_object_storage` | boolean | no | Flag indicating if the secondary Geo site should replicate blobs in Object Storage. | | `selective_sync_type` | string | no | Limit syncing to only specific groups or shards. Valid values: `"namespaces"`, `"shards"`, or `null`. | | `selective_sync_shards` | array | no | The repository storage for the projects synced if `selective_sync_type` == `shards`. | | `selective_sync_namespace_ids` | array | no | The IDs of groups that should be synced, if `selective_sync_type` == `namespaces`. | @@ -223,10 +208,10 @@ Example response: ```json { "id": 1, - "name": "cn-site", - "url": "https://secondary.example.com/", - "internal_url": "https://secondary.example.com/", - "primary": false, + "name": "us-site", + "url": "https://primary.example.com/", + "internal_url": "https://internal.example.com/", + "primary": true, "enabled": true, "current": true, "files_max_capacity": 10, @@ -237,22 +222,15 @@ Example response: "selective_sync_shards": [], "selective_sync_namespace_ids": [1, 25], "minimum_reverification_interval": 7, - "sync_object_storage": true, - "clone_protocol": "http", - "web_edit_url": "https://primary.example.com/admin/geo/sites/2/edit", - "web_geo_projects_url": "https://secondary.example.com/admin/geo/projects", - "web_geo_replication_details_url": "https://secondary.example.com/admin/geo/sites/2/replication/lfs_objects", + "web_edit_url": "https://primary.example.com/admin/geo/sites/1/edit", "_links": { - "self":"https://primary.example.com/api/v4/geo_sites/2", - "status":"https://primary.example.com/api/v4/geo_sites/2/status", - "repair":"https://primary.example.com/api/v4/geo_sites/2/repair" + "self": "https://primary.example.com/api/v4/geo_sites/1", + "status": "https://primary.example.com/api/v4/geo_sites/1/status", + "repair": "https://primary.example.com/api/v4/geo_sites/1/repair" } } -``` -NOTE: -The `web_geo_projects_url` attribute is in its end-of-life process. It is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80106) -in GitLab 14.9. +``` ## Delete a Geo site @@ -289,7 +267,6 @@ Example response: "repos_max_capacity": 25, "verification_max_capacity": 100, "container_repositories_max_capacity": 10, - "clone_protocol": "http", "web_edit_url": "https://primary.example.com/admin/geo/sites/1/edit", "_links": { "self": "https://primary.example.com/api/v4/geo_sites/1", |