From 4b13d06840604b0a2d4eb668226db43f91842892 Mon Sep 17 00:00:00 2001 From: Nailia Iskhakova Date: Fri, 4 Aug 2023 19:27:45 +0200 Subject: [PATCH] Update Sidekiq configuration when using Registry Switch to Sidekiq role for simplicity in RA Signed-off-by: Nailia Iskhakova --- .../reference_architectures/10k_users.md | 13 +------------ .../reference_architectures/25k_users.md | 13 +------------ .../reference_architectures/3k_users.md | 13 +------------ .../reference_architectures/50k_users.md | 13 +------------ .../reference_architectures/5k_users.md | 13 +------------ doc/administration/sidekiq/index.md | 1 - 6 files changed, 5 insertions(+), 61 deletions(-) diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index 2f3174d7fbb44a..c94c76c65321d4 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -1768,18 +1768,7 @@ Updates to example must be made at: --> ```ruby - # Avoid running unnecessary services on the Sidekiq server - gitaly['enable'] = false - postgresql['enable'] = false - redis['enable'] = false - nginx['enable'] = false - puma['enable'] = false - gitlab_workhorse['enable'] = false - prometheus['enable'] = false - alertmanager['enable'] = false - grafana['enable'] = false - gitlab_exporter['enable'] = false - gitlab_kas['enable'] = false + roles ["sidekiq_role"] # External URL ## This should match the URL of the external load balancer diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 731568c487fdcc..2b91d493145697 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -1785,18 +1785,7 @@ Updates to example must be made at: --> ```ruby - # Avoid running unnecessary services on the Sidekiq server - gitaly['enable'] = false - postgresql['enable'] = false - redis['enable'] = false - nginx['enable'] = false - puma['enable'] = false - gitlab_workhorse['enable'] = false - prometheus['enable'] = false - alertmanager['enable'] = false - grafana['enable'] = false - gitlab_exporter['enable'] = false - gitlab_kas['enable'] = false + roles ["sidekiq_role"] # External URL ## This should match the URL of the external load balancer diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index cd95090788d893..cf2d96674817f6 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -1718,18 +1718,7 @@ Updates to example must be made at: --> ```ruby - # Avoid running unnecessary services on the Sidekiq server - gitaly['enable'] = false - postgresql['enable'] = false - redis['enable'] = false - nginx['enable'] = false - puma['enable'] = false - gitlab_workhorse['enable'] = false - prometheus['enable'] = false - alertmanager['enable'] = false - grafana['enable'] = false - gitlab_exporter['enable'] = false - gitlab_kas['enable'] = false + roles ["sidekiq_role"] # External URL ## This should match the URL of the external load balancer diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index b2f01266b14eab..2187b0ff02c06a 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -1781,18 +1781,7 @@ Updates to example must be made at: --> ```ruby - # Avoid running unnecessary services on the Sidekiq server - gitaly['enable'] = false - postgresql['enable'] = false - redis['enable'] = false - nginx['enable'] = false - puma['enable'] = false - gitlab_workhorse['enable'] = false - prometheus['enable'] = false - alertmanager['enable'] = false - grafana['enable'] = false - gitlab_exporter['enable'] = false - gitlab_kas['enable'] = false + roles ["sidekiq_role"] # External URL ## This should match the URL of the external load balancer diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index 70f9b8a1724cad..2b85426de585f9 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -1706,18 +1706,7 @@ Updates to example must be made at: --> ```ruby - # Avoid running unnecessary services on the Sidekiq server - gitaly['enable'] = false - postgresql['enable'] = false - redis['enable'] = false - nginx['enable'] = false - puma['enable'] = false - gitlab_workhorse['enable'] = false - prometheus['enable'] = false - alertmanager['enable'] = false - grafana['enable'] = false - gitlab_exporter['enable'] = false - gitlab_kas['enable'] = false + roles ["sidekiq_role"] # External URL ## This should match the URL of the external load balancer diff --git a/doc/administration/sidekiq/index.md b/doc/administration/sidekiq/index.md index f0b4d2ebf1dafb..10fadc40a8203c 100644 --- a/doc/administration/sidekiq/index.md +++ b/doc/administration/sidekiq/index.md @@ -227,7 +227,6 @@ node than Sidekiq, follow the steps below. 1. Edit `/etc/gitlab/gitlab.rb`, and configure the registry URL: ```ruby - registry_external_url 'https://registry.example.com' gitlab_rails['registry_api_url'] = "https://registry.example.com" ``` -- GitLab