Skip to content

[16.0.x Backport] Stop supporting and using deprecated Gitaly configuration

João Alexandre Cunha requested to merge cherry-pick-3ed10c00 into 16-0-stable

What does this MR do and why?

There's a bug on %16.0 release that is fixed on master but it's affecting users, as explained here by @samihiltunen .

This MR cherry-picks the below commits from !6866 (commits) into the 16-0-stable branch:

Merge branch 'jcunha-remove-long-list-deprecated-gitaly-keys' into 'master'

Stop accepting the old Gitaly config structure

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6866

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Sami Hiltunen <shiltunen@gitlab.com>
Co-authored-by: João Cunha <j.a.cunha@gmail.com>

(cherry picked from commit 3ed10c0017ebda6a1bfb5ba4e1a36326bd331aba)

5b00c71c Remove old Gitaly configuration remapping
7df1ddd2 Bring cgroups_count back to 16.0 removal
2becd036 Move storage under the configuration key
6a378877 Fix Gitaly and Mattermost log_directory keys

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

  • This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
  • The original MR has been deployed to GitLab.com (not applicable for documentation or spec changes).
  • This MR has a severity label assigned (if applicable).

Note to the merge request author and maintainer

The process of backporting bug fixes into stable branches is tracked as part of an internal pilot. If you have questions about this process, please:

Edited by João Alexandre Cunha

Merge request reports