Skip to content

Ensure the consul home directory has execute flags set

DJ Mountney requested to merge fix-consul-home-mode into master

What does this MR do?

Ensure the consul home directory has execute flags set

This ensures that pgbouncer can read it's databases.ini config file when consul managed

In the gitlab docker image this directory is first created by the useradd command prior to running reconfigure, and with our ubuntu 22.04 update this started creating this directory as 0700

Related issues

#8071 (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 "~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.

Test plan

Run a docker container with this config and confirm pgbouncer logs are clean from errors:

consul['enable'] = true
pgbouncer['enable'] = true
pgbouncer['databases_ini'] = '/var/opt/gitlab/consul/databases.ini'

This simulates the pgbouncer databases.ini setup we have when using the watcher like in https://docs.gitlab.com/ee/administration/reference_architectures/50k_users.html#configure-pgbouncer

Edited by Hossein Pursultani

Merge request reports