Skip to content

G
gitlab-ce
Commit b819e1f9 authored by Russell Dickenson's avatar Russell Dickenson
Browse files
Options

Merge branch 'gitlab-pages-can-use-object-storage' into 'master' 

Docs: Pages does not require NFS anymore

See merge request gitlab-org/gitlab!75813
parents a1e601b5 86bf897d
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 23 deletions
doc/administration/reference_architectures/10k_users.md
View file @ b819e1f9
...@@ -2155,8 +2155,7 @@ cluster alongside your instance, read how to ...@@ -2155,8 +2155,7 @@ cluster alongside your instance, read how to
## Configure NFS ## Configure NFS
[Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly) [Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly)
are recommended over NFS wherever possible for improved performance. If you intend are recommended over NFS wherever possible for improved performance.
to use GitLab Pages, this currently [requires NFS](troubleshooting.md#gitlab-pages-requires-nfs).
See how to [configure NFS](../nfs.md). See how to [configure NFS](../nfs.md).
......
doc/administration/reference_architectures/25k_users.md
View file @ b819e1f9
...@@ -2161,8 +2161,7 @@ cluster alongside your instance, read how to ...@@ -2161,8 +2161,7 @@ cluster alongside your instance, read how to
## Configure NFS ## Configure NFS
[Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly) [Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly)
are recommended over NFS wherever possible for improved performance. If you intend are recommended over NFS wherever possible for improved performance.
to use GitLab Pages, this currently [requires NFS](troubleshooting.md#gitlab-pages-requires-nfs).
See how to [configure NFS](../nfs.md). See how to [configure NFS](../nfs.md).
......
doc/administration/reference_architectures/2k_users.md
View file @ b819e1f9
...@@ -102,8 +102,7 @@ To set up GitLab and its components to accommodate up to 2,000 users: ...@@ -102,8 +102,7 @@ To set up GitLab and its components to accommodate up to 2,000 users:
more advanced code search across your entire GitLab instance. more advanced code search across your entire GitLab instance.
1. [Configure NFS](#configure-nfs-optional) (optional, and not recommended) 1. [Configure NFS](#configure-nfs-optional) (optional, and not recommended)
to have shared disk storage service as an alternative to Gitaly or object to have shared disk storage service as an alternative to Gitaly or object
storage. You can skip this step if you're not using GitLab Pages (which storage.
requires NFS).
## Configure the external load balancer ## Configure the external load balancer
...@@ -960,8 +959,7 @@ cluster alongside your instance, read how to ...@@ -960,8 +959,7 @@ cluster alongside your instance, read how to
For improved performance, [object storage](#configure-the-object-storage), For improved performance, [object storage](#configure-the-object-storage),
along with [Gitaly](#configure-gitaly), are recommended over using NFS whenever along with [Gitaly](#configure-gitaly), are recommended over using NFS whenever
possible. However, if you intend to use GitLab Pages, possible.
[you must use NFS](troubleshooting.md#gitlab-pages-requires-nfs).
See how to [configure NFS](../nfs.md). See how to [configure NFS](../nfs.md).
......
doc/administration/reference_architectures/3k_users.md
View file @ b819e1f9
...@@ -187,8 +187,7 @@ To set up GitLab and its components to accommodate up to 3,000 users: ...@@ -187,8 +187,7 @@ To set up GitLab and its components to accommodate up to 3,000 users:
more advanced code search across your entire GitLab instance. more advanced code search across your entire GitLab instance.
1. [Configure NFS](#configure-nfs-optional) (optional, and not recommended) 1. [Configure NFS](#configure-nfs-optional) (optional, and not recommended)
to have shared disk storage service as an alternative to Gitaly or object to have shared disk storage service as an alternative to Gitaly or object
storage. You can skip this step if you're not using GitLab Pages (which storage.
requires NFS).
The servers start on the same 10.6.0.0/24 private network range, and can The servers start on the same 10.6.0.0/24 private network range, and can
connect to each other freely on these addresses. connect to each other freely on these addresses.
...@@ -2103,8 +2102,7 @@ cluster alongside your instance, read how to ...@@ -2103,8 +2102,7 @@ cluster alongside your instance, read how to
## Configure NFS (optional) ## Configure NFS (optional)
[Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly) [Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly)
are recommended over NFS wherever possible for improved performance. If you intend are recommended over NFS wherever possible for improved performance.
to use GitLab Pages, this currently [requires NFS](troubleshooting.md#gitlab-pages-requires-nfs).
See how to [configure NFS](../nfs.md). See how to [configure NFS](../nfs.md).
......
doc/administration/reference_architectures/50k_users.md
View file @ b819e1f9
...@@ -2175,8 +2175,7 @@ cluster alongside your instance, read how to ...@@ -2175,8 +2175,7 @@ cluster alongside your instance, read how to
## Configure NFS ## Configure NFS
[Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly) [Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly)
are recommended over NFS wherever possible for improved performance. If you intend are recommended over NFS wherever possible for improved performance.
to use GitLab Pages, this currently [requires NFS](troubleshooting.md#gitlab-pages-requires-nfs).
See how to [configure NFS](../nfs.md). See how to [configure NFS](../nfs.md).
......
doc/administration/reference_architectures/5k_users.md
View file @ b819e1f9
...@@ -2097,8 +2097,7 @@ cluster alongside your instance, read how to ...@@ -2097,8 +2097,7 @@ cluster alongside your instance, read how to
## Configure NFS (optional) ## Configure NFS (optional)
[Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly) [Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly)
are recommended over NFS wherever possible for improved performance. If you intend are recommended over NFS wherever possible for improved performance.
to use GitLab Pages, this currently [requires NFS](troubleshooting.md#gitlab-pages-requires-nfs).
See how to [configure NFS](../nfs.md). See how to [configure NFS](../nfs.md).
......
doc/administration/reference_architectures/troubleshooting.md
View file @ b819e1f9
...@@ -20,15 +20,14 @@ with the Fog library that GitLab uses. Symptoms include: ...@@ -20,15 +20,14 @@ with the Fog library that GitLab uses. Symptoms include:
411 Length Required 411 Length Required
``` ```
### GitLab Pages requires NFS ### GitLab Pages can use object storage
If you intend to use [GitLab Pages](../../user/project/pages/index.md), this currently requires If you intend to use [GitLab Pages](../../user/project/pages/index.md), you can
[NFS](../nfs.md). There is [work in progress](https://gitlab.com/groups/gitlab-org/-/epics/3901) [configure object storage](../pages/index.md#using-object-storage).
to remove this dependency. In the future, GitLab Pages will use NFS is still available if you prefer.
object storage.
The dependency on disk storage also prevents Pages being deployed using the The [GitLab Pages Helm chart](https://docs.gitlab.com/charts/charts/gitlab/gitlab-pages/) is also available
[GitLab Helm chart](https://gitlab.com/groups/gitlab-org/-/epics/4283). for Kubernetes deployments.
### Incremental logging is required for CI to use object storage ### Incremental logging is required for CI to use object storage
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7