Skip to content

Add support for enabling requirepass in Sentinel configuration

Stan Hu requested to merge sh-support-sentinel-requirepass into master

What does this MR do?

In !6921 (merged), we're adding support for configuring a password to authenticate with Redis Sentinel. This commit adds support for the requirepass config option so that the Omnibus-provided Sentinel can require a password.

If sentinel['password'] is set, the Sentinel instance passwords default to this password to make it easy to enable this option.

Related issues

Relates to gitlab#235938 (closed)

Testing

  1. In /etc/gitlab/gitlab.rb:
sentinel['enable'] = true
sentinel['password'] = 'some password'
  1. Run gitlab-ctl reconfigure.
  2. Without !6921 (merged), you should see these errors in /var/log/gitlab/gitlab-rails/production.log:
Redis::CommandError (NOAUTH Authentication required.):

In /var/log/gitlab/gitlab-workhorse/current, you should also see:

{"error":"keywatcher: redigo: no sentinels available; last error: NOAUTH Authentication required.","level":"error","msg":"","time":"2023-05-26T19:05:40Z"}

Apply !6921 (merged), and GitLab should work again without any errors.

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • MR title and description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • Latest Merge Result pipeline is green.
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow.

For GitLab team members

If you don't have access to this, the reviewer should trigger these jobs for you during the review process.

  • The manual Trigger:ee-package jobs have a green pipeline running against latest commit.
  • If config/software or config/patches directories are changed, make sure the build-package-on-all-os job within the Trigger:ee-package downstream pipeline succeeded.
  • If you are changing anything SSL related, then the Trigger:package:fips manual job within the Trigger:ee-package downstream pipeline must succeed.
  • If CI configuration is changed, the branch must be pushed to dev.gitlab.org to confirm regular branch builds aren't broken.

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes.
  • Documentation created/updated.
  • Tests added.
  • Integration tests added to GitLab QA.
  • Equivalent MR/issue for the GitLab Chart opened.
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.
Edited by Stan Hu

Merge request reports

Loading