From f6bc4a0d371958c84abac806da5b70516bbd8887 Mon Sep 17 00:00:00 2001 From: Andrew Patterson Date: Mon, 1 May 2023 10:33:56 -0600 Subject: [PATCH 1/2] Documentation shows Redis 6.0 as requirement instead of 5.0 Documentation updated to show Redis 6.0 as a requirement instead of Redis 5.0 in both Omnibus installation and reference architecture instructions. --- .../reference_architectures/10k_users.md | 8 +++++--- .../reference_architectures/25k_users.md | 8 +++++--- doc/administration/reference_architectures/2k_users.md | 10 +++------- doc/administration/reference_architectures/3k_users.md | 7 +++---- .../reference_architectures/50k_users.md | 8 +++++--- doc/administration/reference_architectures/5k_users.md | 7 +++---- doc/install/requirements.md | 5 +---- 7 files changed, 25 insertions(+), 28 deletions(-) diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index 2902fa3c5daee9..a36c9505180b81 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -844,9 +844,11 @@ to be used with GitLab. The following IPs will be used as an example: Managed Redis from cloud providers (such as AWS ElastiCache) will work. If these services support high availability, be sure it _isn't_ of the Redis Cluster type. -Redis version 5.0 or higher is required, which is included with Omnibus GitLab -packages starting with GitLab 13.0. Older Redis versions don't support an -optional count argument to SPOP, which is required for [Merge Trains](../../ci/pipelines/merge_trains.md). + +Redis version 6.0 or higher is required, as this is what ships with +Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions +have reached End-Of-Life. + Note the Redis node's IP address or hostname, port, and password (if required). These will be necessary later when configuring the [GitLab application servers](#configure-gitlab-rails). diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 86ef5149b4dc4f..7cfeb3a6c44f49 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -861,9 +861,11 @@ to be used with GitLab. The following IPs will be used as an example: Managed Redis from cloud providers (such as AWS ElastiCache) will work. If these services support high availability, be sure it _isn't_ of the Redis Cluster type. -Redis version 5.0 or higher is required, which is included with Omnibus GitLab -packages starting with GitLab 13.0. Older Redis versions don't support an -optional count argument to SPOP, which is required for [Merge Trains](../../ci/pipelines/merge_trains.md). + +Redis version 6.0 or higher is required, as this is what ships with +Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions +have reached End-Of-Life. + Note the Redis node's IP address or hostname, port, and password (if required). These will be necessary later when configuring the [GitLab application servers](#configure-gitlab-rails). diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index e94e7a162cb249..d73c126c873226 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -341,13 +341,9 @@ to be used with GitLab. ### Provide your own Redis instance -Redis version 5.0 or higher is required, as this is what ships with -Omnibus GitLab packages starting with GitLab 13.0. Older Redis versions -do not support an optional count argument to SPOP which is now required for -[Merge Trains](../../ci/pipelines/merge_trains.md). - -In addition, GitLab makes use of certain commands like `UNLINK` and `USAGE` which -were introduced only in Redis 4. +Redis version 6.0 or higher is required, as this is what ships with +Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions +have reached End-Of-Life. Managed Redis from cloud providers such as AWS ElastiCache will work. If these services support high availability, be sure it is not the Redis Cluster type. diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index e26d954a11b5b1..21ce87903efe42 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -455,10 +455,9 @@ to be used with GitLab. The following IPs will be used as an example: Managed Redis from cloud providers such as AWS ElastiCache will work. If these services support high availability, be sure it is **not** the Redis Cluster type. -Redis version 5.0 or higher is required, as this is what ships with -Omnibus GitLab packages starting with GitLab 13.0. Older Redis versions -do not support an optional count argument to SPOP which is now required for -[Merge Trains](../../ci/pipelines/merge_trains.md). +Redis version 6.0 or higher is required, as this is what ships with +Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions +have reached End-Of-Life. Note the Redis node's IP address or hostname, port, and password (if required). These will be necessary when configuring the diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index 8b76d254e5c805..1deee5b372e882 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -854,9 +854,11 @@ to be used with GitLab. The following IPs will be used as an example: Managed Redis from cloud providers (such as AWS ElastiCache) will work. If these services support high availability, be sure it _isn't_ of the Redis Cluster type. -Redis version 5.0 or higher is required, which is included with Omnibus GitLab -packages starting with GitLab 13.0. Older Redis versions don't support an -optional count argument to SPOP, which is required for [Merge Trains](../../ci/pipelines/merge_trains.md). + +Redis version 6.0 or higher is required, as this is what ships with +Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions +have reached End-Of-Life. + Note the Redis node's IP address or hostname, port, and password (if required). These will be necessary later when configuring the [GitLab application servers](#configure-gitlab-rails). diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index d205993d5ab7d4..bbb145f94de5ac 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -452,10 +452,9 @@ to be used with GitLab. The following IPs are used as an example: Managed Redis from cloud providers such as AWS ElastiCache works. If these services support high availability, be sure it is **not** the Redis Cluster type. -Redis version 5.0 or higher is required, as this is what ships with -Omnibus GitLab packages starting with GitLab 13.0. Older Redis versions -do not support an optional count argument to SPOP which is now required for -[Merge Trains](../../ci/pipelines/merge_trains.md). +Redis version 6.0 or higher is required, as this is what ships with +Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions +have reached End-Of-Life. Note the Redis node's IP address or hostname, port, and password (if required). These are necessary when configuring the diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 8c6f469aca24f4..ea43978458a6b8 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -12,10 +12,7 @@ This page includes information about the minimum requirements you need to instal ### Redis versions -GitLab 13.0 and later requires Redis version 5.0 or higher. - -Redis version 6.0 or higher is recommended, as this is what ships with -[Omnibus GitLab](https://docs.gitlab.com/omnibus/) packages starting with GitLab 13.9. +GitLab 16.0 and later requires Redis version 6.0 or higher. ## Hardware requirements -- GitLab From fe3ae1d470f9ed332e4aa28acb4165e01379db4c Mon Sep 17 00:00:00 2001 From: Evan Read Date: Tue, 2 May 2023 23:20:58 +0000 Subject: [PATCH 2/2] Apply 7 suggestion(s) to 7 file(s) --- doc/administration/reference_architectures/10k_users.md | 4 +--- doc/administration/reference_architectures/25k_users.md | 4 +--- doc/administration/reference_architectures/2k_users.md | 4 +--- doc/administration/reference_architectures/3k_users.md | 4 +--- doc/administration/reference_architectures/50k_users.md | 4 +--- doc/administration/reference_architectures/5k_users.md | 4 +--- doc/install/requirements.md | 2 +- 7 files changed, 7 insertions(+), 19 deletions(-) diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index a36c9505180b81..663d4b206f7bf0 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -845,9 +845,7 @@ to be used with GitLab. The following IPs will be used as an example: Managed Redis from cloud providers (such as AWS ElastiCache) will work. If these services support high availability, be sure it _isn't_ of the Redis Cluster type. -Redis version 6.0 or higher is required, as this is what ships with -Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions -have reached End-Of-Life. +Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or higher is required. Older Redis versions have reached end-of-life. Note the Redis node's IP address or hostname, port, and password (if required). These will be necessary later when configuring the [GitLab application servers](#configure-gitlab-rails). diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 7cfeb3a6c44f49..2ff47eaa1432f0 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -862,9 +862,7 @@ to be used with GitLab. The following IPs will be used as an example: Managed Redis from cloud providers (such as AWS ElastiCache) will work. If these services support high availability, be sure it _isn't_ of the Redis Cluster type. -Redis version 6.0 or higher is required, as this is what ships with -Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions -have reached End-Of-Life. +Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or higher is required. Older Redis versions have reached end-of-life. Note the Redis node's IP address or hostname, port, and password (if required). These will be necessary later when configuring the [GitLab application servers](#configure-gitlab-rails). diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index d73c126c873226..7af577bd75a4fc 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -341,9 +341,7 @@ to be used with GitLab. ### Provide your own Redis instance -Redis version 6.0 or higher is required, as this is what ships with -Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions -have reached End-Of-Life. +Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or higher is required. Older Redis versions have reached end-of-life. Managed Redis from cloud providers such as AWS ElastiCache will work. If these services support high availability, be sure it is not the Redis Cluster type. diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index 21ce87903efe42..b5c5717e56d5e7 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -455,9 +455,7 @@ to be used with GitLab. The following IPs will be used as an example: Managed Redis from cloud providers such as AWS ElastiCache will work. If these services support high availability, be sure it is **not** the Redis Cluster type. -Redis version 6.0 or higher is required, as this is what ships with -Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions -have reached End-Of-Life. +Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or higher is required. Older Redis versions have reached end-of-life. Note the Redis node's IP address or hostname, port, and password (if required). These will be necessary when configuring the diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index 1deee5b372e882..90aab6873b61b7 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -855,9 +855,7 @@ to be used with GitLab. The following IPs will be used as an example: Managed Redis from cloud providers (such as AWS ElastiCache) will work. If these services support high availability, be sure it _isn't_ of the Redis Cluster type. -Redis version 6.0 or higher is required, as this is what ships with -Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions -have reached End-Of-Life. +Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or higher is required. Older Redis versions have reached end-of-life. Note the Redis node's IP address or hostname, port, and password (if required). These will be necessary later when configuring the [GitLab application servers](#configure-gitlab-rails). diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index bbb145f94de5ac..292cf537ba65b6 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -452,9 +452,7 @@ to be used with GitLab. The following IPs are used as an example: Managed Redis from cloud providers such as AWS ElastiCache works. If these services support high availability, be sure it is **not** the Redis Cluster type. -Redis version 6.0 or higher is required, as this is what ships with -Omnibus GitLab packages starting with GitLab 13.9. Older Redis versions -have reached End-Of-Life. +Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or higher is required. Older Redis versions have reached end-of-life. Note the Redis node's IP address or hostname, port, and password (if required). These are necessary when configuring the diff --git a/doc/install/requirements.md b/doc/install/requirements.md index ea43978458a6b8..8d779ec978d85e 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -12,7 +12,7 @@ This page includes information about the minimum requirements you need to instal ### Redis versions -GitLab 16.0 and later requires Redis version 6.0 or higher. +GitLab 16.0 and later requires Redis 6.0 or later. ## Hardware requirements -- GitLab