Skip to content
Snippets Groups Projects

Make ActionCable Redis settings use default Redis Sentinel password

Merged Stan Hu requested to merge sh-fallback-redis-sentinel-password-actioncable into master

What does this MR do?

Suppose you have this config:

gitlab_rails['redis_sentinels'] = [
  {"host"=>"gitlabtest-cluster-redis-01", "port"=>26379},
  {"host"=>"gitlabtest-cluster-redis-02", "port"=>26379},
  {"host"=>"gitlabtest-cluster-redis-03", "port"=>26379}
]
gitlab_rails['redis_sentinels_password'] = "some password"
redis['enable'] = false
redis['master_name'] = "gitlab-redis"
redis['master_password'] = "some password"

Previously ActionCable Redis settings would only look for gitlab_rails['redis_actioncable_sentinels_password'] and did not fall back to gitlab_rails['redis_sentinels_password'].

Related issues

Relates to #8728 (closed)

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 workflowready 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

Checking pipeline status.

Merged by Balasankar 'Balu' CBalasankar 'Balu' C 4 months ago (Nov 5, 2024 5:07am UTC)

Loading

Pipeline #1527700343 passed

Pipeline passed for fdc84224 on master

7 environments impacted.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Stan Hu requested review from @jondoveston

    requested review from @jondoveston

  • E2E Test Result Summary

    allure-report-publisher generated test report!

    qa-subset-test: :white_check_mark: test report for 448d9d3c

    expand test summary
    +---------------------------------------------------------------------+
    |                           suites summary                            |
    +----------------+--------+--------+---------+-------+-------+--------+
    |                | passed | failed | skipped | flaky | total | result |
    +----------------+--------+--------+---------+-------+-------+--------+
    | Govern         | 48     | 0      | 2       | 0     | 50    | ✅     |
    | Create         | 46     | 0      | 20      | 0     | 66    | ✅     |
    | Plan           | 19     | 0      | 0       | 0     | 19    | ✅     |
    | Monitor        | 8      | 0      | 1       | 0     | 9     | ✅     |
    | Release        | 1      | 0      | 0       | 0     | 1     | ✅     |
    | Systems        | 6      | 0      | 1       | 0     | 7     | ✅     |
    | Package        | 10     | 0      | 4       | 0     | 14    | ✅     |
    | Data Stores    | 11     | 0      | 0       | 0     | 11    | ✅     |
    | Verify         | 4      | 0      | 1       | 0     | 5     | ✅     |
    | GitLab Metrics | 2      | 0      | 1       | 0     | 3     | ✅     |
    | Manage         | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Configure      | 1      | 0      | 0       | 0     | 1     | ✅     |
    +----------------+--------+--------+---------+-------+-------+--------+
    | Total          | 158    | 0      | 30      | 0     | 188   | ✅     |
    +----------------+--------+--------+---------+-------+-------+--------+
    Edited by Ghost User
  • Stan Hu requested review from @balasankarc and removed review request for @jondoveston

    requested review from @balasankarc and removed review request for @jondoveston

    • Resolved by Andrew Patterson

      @stanhu What happens if a user have one set of sentinels with password for Redis and another set without password for ActionCable? Should we gate this on whether Gitlab['gitlab_rails']['redis_actioncable_sentinels'] is empty or not (which should mean that actioncable uses the same sentinels as Redis)?

  • As @balasankarc & @rmarshall are currently OOO, asking @apatterson2 to review.

  • Jason Plum requested review from @apatterson2 and removed review request for @balasankarc

    requested review from @apatterson2 and removed review request for @balasankarc

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading