Add latest changes from gitlab-org/gitlab@master

2 files changed, 48 insertions, 4 deletions

diff --git a/doc/administration/backup_restore/backup_large_reference_architectures.md b/doc/administration/backup_restore/backup_large_reference_architectures.md
index 4e11a707052..8e03ae7aded 100644
--- a/doc/administration/backup_restore/backup_large_reference_architectures.md
+++ b/doc/administration/backup_restore/backup_large_reference_architectures.md
@@ -48,7 +48,38 @@ There is a feature proposal to add the ability to back up repositories directly
 
   1. Spin up a VM with 8 vCPU and 7.2 GB memory. This node will be used to back up Git repositories. Note that
      [a Praefect node cannot be used to back up Git data](https://gitlab.com/gitlab-org/gitlab/-/issues/396343#note_1385950340).
-  1. Configure the node as another **GitLab Rails** node as defined in your [reference architecture](../reference_architectures/index.md). As with other GitLab Rails nodes, this node must have access to your main Postgres database as well as to Gitaly Cluster.
+  1. Configure the node as another **GitLab Rails** node as defined in your [reference architecture](../reference_architectures/index.md).
+     As with other GitLab Rails nodes, this node must have access to your main PostgreSQL database, Redis, object storage, and Gitaly Cluster.
+  1. Ensure the GitLab application isn't running on this node by disabling most services:
+
+     1. Edit `/etc/gitlab/gitlab.rb` to ensure the following services are disabled.
+        `roles(['application_role'])` disables Redis, PostgreSQL, and Consul, and
+        is the basis of the reference architecture Rails node definition.
+
+        ```ruby
+        roles(['application_role'])
+        gitlab_workhorse['enable'] = false
+        puma['enable'] = false
+        sidekiq['enable'] = false
+        gitlab_kas['enable'] = false
+        gitaly['enable'] = false
+        prometheus_monitoring['enable'] = false
+        ```
+
+     1. Reconfigure GitLab:
+
+        ```shell
+        sudo gitlab-ctl reconfigure
+        ```
+
+     1. The only service that should be left is `logrotate`, you can verify with:
+
+        ```shell
+        gitlab-ctl status
+        ```
+
+     There is [a feature request](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6823) for a role in the Linux package
+     that meets these requirements.
 
 To back up the Git repositories:
 
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md
index 308ca7b379e..92af1a785ce 100644
--- a/doc/administration/packages/container_registry.md
+++ b/doc/administration/packages/container_registry.md
@@ -380,10 +380,23 @@ The different supported drivers are:
 | `azure`      | Microsoft Azure Blob Storage         |
 | `gcs`        | Google Cloud Storage                 |
 | `s3`         | Amazon Simple Storage Service. Be sure to configure your storage bucket with the correct [S3 Permission Scopes](https://docs.docker.com/registry/storage-drivers/s3/#s3-permission-scopes). |
-| `swift`      | OpenStack Swift Object Storage       |
-| `oss`        | Aliyun OSS                           |
 
-Although most S3 compatible services (like [MinIO](https://min.io/)) should work with the container registry, we only guarantee support for AWS S3. Because we cannot assert the correctness of third-party S3 implementations, we can debug issues, but we cannot patch the registry unless an issue is reproducible against an AWS S3 bucket.
+Although most S3 compatible services (like [MinIO](https://min.io/)) should work with the container registry,
+we only guarantee support for AWS S3. Because we cannot assert the correctness of third-party S3 implementations,
+we can debug issues, but we cannot patch the registry unless an issue is reproducible against an AWS S3 bucket.
+
+<!--- start_remove The following content will be removed on remove_date: '2024-05-16' -->
+
+WARNING:
+Support for the following drivers was [deprecated](https://gitlab.com/gitlab-org/container-registry/-/issues/1141)
+in GitLab 16.6, and is planned for removal in 17.0. This change is a breaking change.
+
+| Driver  | Description |
+|---------|-------------|
+| `swift` | OpenStack Swift Object Storage |
+| `oss`   | Aliyun OSS  |
+
+<!--- end_remove -->
 
 ### Use file system