Support password authentication for Redis Sentinel
This commit adds a separate password parameter for each Sentinel group and enables GitLab Rails, Workhorse, and `gitlab-kas` to use a password specified in `requirepass` in the Sentinel configuration: ```ruby gitlab_rails['redis_sentinels_password'] gitlab_rails['redis_cache_sentinels_password'] gitlab_rails['redis_queues_sentinels_password'] gitlab_rails['redis_shared_state_sentinels_password'] gitlab_rails['redis_trace_chunks_sentinels_password'] gitlab_rails['redis_actioncable_sentinels_password'] gitlab_rails['redis_rate_limiting_sentinels_password'] gitlab_rails['redis_sessions_sentinels_password'] gitlab_rails['redis_cluster_rate_limiting_sentinels_password'] gitlab_rails['redis_repository_cache_sentinels_password'] ``` We could avoid these extra configuration parameters by having the admin specify a `password` parameter for each host/port combination in `redis_sentinels`, `redis_cache_sentinels`, etc. However, this would add much duplication in the configuration and different passwords aren't actually supported by Redis Sentinel. gitlab-kas also expects a single Sentinel password stored in the `sentinel_password_file` configuration parameter. Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/235938 Changelog: added
parent
ea165a3cdc9d
No related branches found
No related tags found
Showing
- files/gitlab-config-template/gitlab.rb.template 10 additions, 1 deletionfiles/gitlab-config-template/gitlab.rb.template
- files/gitlab-cookbooks/gitlab-kas/recipes/enable.rb 19 additions, 3 deletionsfiles/gitlab-cookbooks/gitlab-kas/recipes/enable.rb
- files/gitlab-cookbooks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb 3 additions, 0 deletions...ks/gitlab-kas/templates/default/gitlab-kas-config.yml.erb
- files/gitlab-cookbooks/gitlab/attributes/default.rb 10 additions, 0 deletionsfiles/gitlab-cookbooks/gitlab/attributes/default.rb
- files/gitlab-cookbooks/gitlab/libraries/redis_helper.rb 39 additions, 6 deletionsfiles/gitlab-cookbooks/gitlab/libraries/redis_helper.rb
- files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb 6 additions, 2 deletionsfiles/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
- files/gitlab-cookbooks/gitlab/recipes/gitlab-workhorse.rb 2 additions, 2 deletionsfiles/gitlab-cookbooks/gitlab/recipes/gitlab-workhorse.rb
- files/gitlab-cookbooks/gitlab/templates/default/cable.yml.erb 1 addition, 0 deletions...s/gitlab-cookbooks/gitlab/templates/default/cable.yml.erb
- files/gitlab-cookbooks/gitlab/templates/default/resque.yml.erb 1 addition, 0 deletions.../gitlab-cookbooks/gitlab/templates/default/resque.yml.erb
- files/gitlab-cookbooks/gitlab/templates/default/workhorse-config.toml.erb 1 addition, 1 deletion...kbooks/gitlab/templates/default/workhorse-config.toml.erb
- spec/chef/cookbooks/gitlab-kas/recipes/gitlab-kas_spec.rb 39 additions, 3 deletionsspec/chef/cookbooks/gitlab-kas/recipes/gitlab-kas_spec.rb
- spec/chef/cookbooks/gitlab/recipes/gitlab-rails_spec.rb 50 additions, 1 deletionspec/chef/cookbooks/gitlab/recipes/gitlab-rails_spec.rb
- spec/chef/cookbooks/gitlab/recipes/gitlab-workhorse_spec.rb 31 additions, 2 deletionsspec/chef/cookbooks/gitlab/recipes/gitlab-workhorse_spec.rb
Loading
Please register or sign in to comment