Commit b819e1f9 authored by Russell Dickenson's avatar Russell Dickenson

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
......@@ -2155,8 +2155,7 @@ cluster alongside your instance, read how to
## Configure NFS
[Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly)
are recommended over NFS wherever possible for improved performance. If you intend
to use GitLab Pages, this currently [requires NFS](troubleshooting.md#gitlab-pages-requires-nfs).
are recommended over NFS wherever possible for improved performance.
See how to [configure NFS](../nfs.md).
......
......@@ -2161,8 +2161,7 @@ cluster alongside your instance, read how to
## Configure NFS
[Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly)
are recommended over NFS wherever possible for improved performance. If you intend
to use GitLab Pages, this currently [requires NFS](troubleshooting.md#gitlab-pages-requires-nfs).
are recommended over NFS wherever possible for improved performance.
See how to [configure NFS](../nfs.md).
......
......@@ -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.
1. [Configure NFS](#configure-nfs-optional) (optional, and not recommended)
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
requires NFS).
storage.
## Configure the external load balancer
......@@ -960,8 +959,7 @@ cluster alongside your instance, read how to
For improved performance, [object storage](#configure-the-object-storage),
along with [Gitaly](#configure-gitaly), are recommended over using NFS whenever
possible. However, if you intend to use GitLab Pages,
[you must use NFS](troubleshooting.md#gitlab-pages-requires-nfs).
possible.
See how to [configure NFS](../nfs.md).
......
......@@ -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.
1. [Configure NFS](#configure-nfs-optional) (optional, and not recommended)
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
requires NFS).
storage.
The servers start on the same 10.6.0.0/24 private network range, and can
connect to each other freely on these addresses.
......@@ -2103,8 +2102,7 @@ cluster alongside your instance, read how to
## Configure NFS (optional)
[Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly)
are recommended over NFS wherever possible for improved performance. If you intend
to use GitLab Pages, this currently [requires NFS](troubleshooting.md#gitlab-pages-requires-nfs).
are recommended over NFS wherever possible for improved performance.
See how to [configure NFS](../nfs.md).
......
......@@ -2175,8 +2175,7 @@ cluster alongside your instance, read how to
## Configure NFS
[Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly)
are recommended over NFS wherever possible for improved performance. If you intend
to use GitLab Pages, this currently [requires NFS](troubleshooting.md#gitlab-pages-requires-nfs).
are recommended over NFS wherever possible for improved performance.
See how to [configure NFS](../nfs.md).
......
......@@ -2097,8 +2097,7 @@ cluster alongside your instance, read how to
## Configure NFS (optional)
[Object storage](#configure-the-object-storage), along with [Gitaly](#configure-gitaly)
are recommended over NFS wherever possible for improved performance. If you intend
to use GitLab Pages, this currently [requires NFS](troubleshooting.md#gitlab-pages-requires-nfs).
are recommended over NFS wherever possible for improved performance.
See how to [configure NFS](../nfs.md).
......
......@@ -20,15 +20,14 @@ with the Fog library that GitLab uses. Symptoms include:
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
[NFS](../nfs.md). There is [work in progress](https://gitlab.com/groups/gitlab-org/-/epics/3901)
to remove this dependency. In the future, GitLab Pages will use
object storage.
If you intend to use [GitLab Pages](../../user/project/pages/index.md), you can
[configure object storage](../pages/index.md#using-object-storage).
NFS is still available if you prefer.
The dependency on disk storage also prevents Pages being deployed using the
[GitLab Helm chart](https://gitlab.com/groups/gitlab-org/-/epics/4283).
The [GitLab Pages Helm chart](https://docs.gitlab.com/charts/charts/gitlab/gitlab-pages/) is also available
for Kubernetes deployments.
### 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