Commit Graph

17956 Commits

Author SHA1 Message Date
Robert Marshall 44350bbdd2 Merge branch 'move-gitlab-rails-redis-helper' into 'master'
Migrate Gitlab Rails to NewRedisHelper logic

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Dustin Collins <714871-dustinmm80@users.noreply.gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Reviewed-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
Co-authored-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-05-15 19:08:58 +00:00
Balasankar 'Balu' C 82bcde6d90 Migrate Gitlab Rails to NewRedisHelper logic
- Moves the Gitlab Rails library to use the new
  redis helper logic code path.

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-05-15 19:08:58 +00:00
GitLab Release Tools Bot 06fd7748fa Update changelog for 17.0.0
[ci skip]
2024-05-15 08:05:23 +00:00
Robert Marshall aa59edfbcc Merge branch 'sh-drop-chef-eol-message' into 'master'
Drop Cinc EOL warning

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-05-15 06:08:34 +00:00
Robert Marshall 49fbebbc1d Merge branch 'deps/69b928e-9e657fb' into 'master'
Update gitlab-org/gitlab-exporter from 14.4.0 to 14.5.0

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Clemens Beck <cbeck@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-05-15 05:51:17 +00:00
DEPS_GITLAB_TOKEN - For deps.io to create MRs b7442832bb Bump gitlab-exporter to version 14.5.0
- Updates gitlab-org/gitlab-exporter from 14.4.0 to 14.5.0

Changelog: changed
2024-05-15 05:51:17 +00:00
Robert Marshall 6e0e74da37 Merge branch 'deps/4225d27-f935fb0' into 'master'
Update rubygems/rubygems from 3.5.9 to 3.5.10

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Dmytro Makovey <dmakovey@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-05-15 04:40:14 +00:00
DEPS_GITLAB_TOKEN - For deps.io to create MRs 0d31fc3067 Bump rubygems to version 3.5.10
- Updates rubygems/rubygems from 3.5.9 to 3.5.10

Changelog: changed
2024-05-15 04:40:14 +00:00
Marcin Sedlak-Jakubowski 505964ecf1 Merge branch 'docs-update-directory-for-update-keys-after-expiration' into 'master'
Docs: Update repo directory for update keys after expiration

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

Merged-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Approved-by: Axel von Bertoldi <avonbertoldi@gitlab.com>
Approved-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Reviewed-by: alexgit2k <utaker2k-git@yahoo.de>
Co-authored-by: fneill <fneill@gitlab.com>
2024-05-13 17:12:03 +00:00
Fiona Neill 6fcbde640d Docs: Update repo directory for update keys after expiration 2024-05-13 17:12:02 +00:00
Robert Marshall 74817b6f57 Merge branch 'skip-storage-uniqueness-if-gitaly-not-running' into 'master'
Skip Gitaly storages uniqueness check if Gitaly is not enabled

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Igor <iwiedler@gitlab.com>
Approved-by: Toon Claes <toon@gitlab.com>
Approved-by: Alessio Caiazza <acaiazza@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-05-10 14:51:38 +00:00
Balasankar 'Balu' C 474076cb89 Skip Gitaly storages uniqueness check if Gitaly is not enabled
- If a node has legacy `git-data` storages configured but no
  longer runs the gitaly service, skip the unique storage path
  validation check.

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-05-10 14:51:37 +00:00
Balasankar 'Balu' C 28ac725403 Merge branch 'sh-fix-unix-redis-with-password' into 'master'
redis: Fix password auth with UNIX domain sockets

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Ian Baum <ibaum@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Gabriel Mazetto <gabriel@gitlab.com>
Reviewed-by: Ian Baum <ibaum@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-05-10 10:16:49 +00:00
Stan Hu 40b4a31d2a
Drop Cinc EOL warning
Previously users would see this warning at the end of a reconfigure:

```
WARN: This release of Cinc Client became end of life (EOL) on May 1st 2024
```

This warning started to show up on a May 1, 2024, but the admin has no
control over what version of Cinc is used. Disable this warning since
it doesn't provide any useful information.

Changelog: changed
2024-05-09 22:12:28 -07:00
Evan Read c195e352b5 Merge branch 'mkozono-master-patch-92735' into 'master'
Update Configuring log level

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

Merged-by: Evan Read <eread@gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Co-authored-by: Michael Kozono <mkozono@gitlab.com>
2024-05-09 23:18:35 +00:00
Michael Kozono 8f4d656911 Remove mention of sidekiq.log
See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149790
2024-05-09 23:18:34 +00:00
Robert Marshall d0eba1b5ae Merge branch 'wc/no-dup-gitaly-storages' into 'master'
Prevent Gitaly storages from using the same path

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Gabriel Mazetto <gabriel@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Reviewed-by: Gabriel Mazetto <gabriel@gitlab.com>
Reviewed-by: Will Chandler <wchandler@gitlab.com>
Reviewed-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Will Chandler <wchandler@gitlab.com>
2024-05-09 22:39:30 +00:00
Will Chandler 57396c7aba Prevent Gitaly storages from using the same path
Gitaly is making a breaking change with v17.0 to prevent multiple
storages from sharing the same local path. This is being done as part of
the work to add a write-ahead log to Gitaly, see
https://gitlab.com/gitlab-org/gitaly/-/issues/5598 for further details.

Validate that Gitaly's config does not have more than one storage using
the same path, dereferencing any symlinks.

Changelog: changed
2024-05-09 22:39:29 +00:00
Andrew Patterson 132fc312d2 Merge branch '8084-stop-ubuntu-18-04-activity' into 'master'
Stop all Ubuntu 18.04 pipeline activity

Closes #8084 and #8083

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

Merged-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Hossein Pursultani <hpursultani@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: Robert Marshall <rmarshall@gitlab.com>
2024-05-09 19:32:22 +00:00
Robert Marshall 6dd718199d Merge branch 'add-reconfigure-documentation' into 'master'
Add documentation on what happens during gitlab-ctl reconfigure

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: João Alexandre Cunha <j.a.cunha@gmail.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Reviewed-by: João Alexandre Cunha <j.a.cunha@gmail.com>
Reviewed-by: Robert Marshall <rmarshall@gitlab.com>
Reviewed-by: Evan Read <eread@gitlab.com>
Co-authored-by: Balasankar "Balu" C <balasankar@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
2024-05-09 16:16:42 +00:00
Balasankar 'Balu' C 5baed11c98 Improve reconfigure process documentation
- Adds much more detail around the process that happens
  when gitlab-ctl reconfigure executes.
- Adds notes to the recipes to clarify what happens in
  the context of a reconfigure run.

Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2024-05-09 16:16:41 +00:00
GitLab Release Tools Bot f4527e12f1 Update changelog for 16.9.8
[ci skip]
2024-05-09 10:14:50 +00:00
Balasankar 'Balu' C bc0bd127f9 Merge branch 'sh-update-omnibus-gems' into 'master'
Upgrade some Omnibus-related gems

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-05-09 07:31:12 +00:00
Robert Marshall 7d5ccca38e Merge branch 'sh-upgrade-ruby' into 'master'
Upgrade to Ruby 3.1.5 and add support for Ruby 3.2.5

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-05-09 05:51:45 +00:00
Stan Hu ab12454b3e Upgrade to Ruby 3.1.5 and add support for Ruby 3.2.5
This fixes a number of CVEs a bugs:

* https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-1-5-released/
* https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-2-4-released/

This drops the `fix-ruby-xfree-for-libxml2` patch for Ruby 3.1.5 since
the change has been merged upstream.

This will also enable us to update to Puma 6.4.2 since
https://bugs.ruby-lang.org/issues/19837 has been resolved in Ruby
3.1.5.

Changelog: changed
2024-05-09 05:51:45 +00:00
Marcel Amirault 31c099f90d Merge branch 'docs-update-vale-tiers-badges' into 'master'
Adding tier badge rules

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

Merged-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Reviewed-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Suzanne Selhorn <sselhorn@gitlab.com>
2024-05-09 01:59:40 +00:00
Stan Hu 182c5aee69 Upgrade some Omnibus-related gems
In https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7362,
the `Gemfile.lock` was locked to a number of gem versions present
around January 2024.

As seen in
https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7584#note_1897220176,
we have been pulling in more recent versions of these gems for
recent patch releases, so let's use these updated versions
so that we minimize the diff.
2024-05-08 17:21:49 -06:00
Suzanne Selhorn cde5fb023d Adding tier badge rules
Because we need to check the consistency
of the tier badges

Related to: https://gitlab.com/gitlab-org/gitlab/-/issues/458260
2024-05-08 10:24:23 -07:00
Balasankar 'Balu' C 7b7b2e1fb5 Merge branch 'fix/jcunha-please-rubocop-with-eof' into 'master'
Bring EOF back to upgrade_check file

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: João Cunha <j.a.cunha@gmail.com>
2024-05-08 15:38:55 +00:00
João Cunha e320a46820
Bring EOF back to upgrade_check file 2024-05-08 17:08:07 +02:00
Balasankar 'Balu' C 8bf2c5160c Merge branch 'upgrade-stop-16-11' into 'master'
Enforce upgrade stop at 16.11

Closes #8518

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: João Alexandre Cunha <j.a.cunha@gmail.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Clemens Beck <cbeck@gitlab.com>
2024-05-08 14:53:29 +00:00
GitLab Release Tools Bot 86b17db5e9 Merge remote-tracking branch 'dev/master' 2024-05-08 10:47:34 +00:00
Robert Marshall 5846827da7 Stop all Ubuntu 18.04 pipeline activity
- Do not run Ubuntu 18.04 package uploads.
- Do not run Ubuntu 18.04 package builds.
- Do not run Ubuntu 18.04 rspec jobs.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8084

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8083

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2024-05-07 13:45:05 -04:00
GitLab Release Tools Bot 27345e8b2d Update changelog for 16.9.7
[ci skip]
2024-05-07 16:56:27 +00:00
GitLab Release Tools Bot 8b6b7af263 Update upgrade stop to 16.7
[ci skip]
2024-05-07 16:28:05 +00:00
GitLab Release Tools Bot 9cd26537bc Update changelog for 16.10.5
[ci skip]
2024-05-07 16:28:00 +00:00
GitLab Release Tools Bot aeb111224d Update upgrade stop to 16.11
[ci skip]
2024-05-07 16:15:38 +00:00
GitLab Release Tools Bot 628d61c467 Update changelog for 16.11.2
[ci skip]
2024-05-07 16:15:33 +00:00
Balasankar 'Balu' C 706b752f07 Merge branch '8523-do-not-use-ubuntu-18-for-jobs' into 'master'
Use Ubuntu 22.04 for license and manifest upload

Closes #8523

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Ryan Egesdahl <regesdahl@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Robert Marshall <rmarshall@gitlab.com>
2024-05-07 11:01:17 +00:00
Robert Marshall e1dfa73551 Use Ubuntu 22.04 for license and manifest upload
- Updates the license and manifest upload jobs to use Ubuntu 22.04
  instead of Ubuntu 18.04. Ubuntu 18.04 reached end of standard support
  on May 31, 2023 and was deprecated in GitLab version 16.9.

Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8084

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8523

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
2024-05-07 11:01:16 +00:00
Balasankar 'Balu' C 82b342458b Merge branch '8341-remove-pg-13' into 'master'
Remove PostgreSQL 13

Closes #8341

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Ryan Egesdahl <regesdahl@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Ryan Egesdahl <regesdahl@gitlab.com>
Co-authored-by: Clemens Beck <cbeck@gitlab.com>
2024-05-07 05:24:29 +00:00
Clemens Beck 92f7cf5b6c Remove PostgreSQL 13
* Remove PostgreSQL 13 builds.
* Remove unused PostgreSQL 12 build definition.
* Move PostgreSQL 14 from 'new' to 'default' build definition.
* Update minimum PostgreSQL version notice.

Closes https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8341

Changelog: removed
2024-05-07 05:24:28 +00:00
Andrew Patterson 196b5a3326 Merge branch 'deps/19dfc8b-42de0a3' into 'master'
Update gitlab-org/container-registry from v3.93.0-gitlab to v4.0.0-gitlab

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

Merged-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Clemens Beck <cbeck@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-05-06 17:32:03 +00:00
Balasankar 'Balu' C 6f0f625f4e Merge branch 'sh-use-bundler' into 'master'
Use bundler to install Omnibus gems

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Reviewed-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-05-06 04:02:47 +00:00
Stan Hu 38bd8dffec Use bundler to install Omnibus gems
Instead of calling `gem install <x>` many times, let's define the
`Gemfile` and `Gemfile.lock` and run `bundle install`. This ensures
dependencies are pinned and don't quietly move with a new invocation
of `gem install`. There is also a side benefit to using `bundler`: we
can later use the newly-introduced feature to include and verify
checksums (https://github.com/rubygems/rubygems/pull/6374).

`bundler` generally installs everything in the expected gem directory
 that is used by `ruby`, but for gems installed from a Git source,
`bundler` puts those gems in a special `bundler/gems` directory.
We don't use any gems from Git sources now--`gitlab-ruby-shadow`
is now used instead of `ruby-shadow`--there is no issue.

Also, note that if we want to ensure `gitlab-ctl` doesn't try to pull
in gems from GitLab Rails, we could invoke `bundler`, but this is a
slightly riskier change.

Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8368

Changelog: changed
2024-05-06 04:02:46 +00:00
Robert Marshall d94cbec689 Merge branch 'mg-remove-min-max-concurrency' into 'master'
Remove deprecated min_concurrency and max_concurrency for Sidekiq

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Dustin Collins <714871-dustinmm80@users.noreply.gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Reviewed-by: Jason Plum <jplum@gitlab.com>
Co-authored-by: Ryan Egesdahl <regesdahl@gitlab.com>
Co-authored-by: Gregorius Marco <gmarco@gitlab.com>
2024-05-04 00:39:29 +00:00
Gregorius Marco cfa756435e Remove deprecated min_concurrency and max_concurrency for Sidekiq
- Eliminates code related to `min_concurrency` and
  `max_concurrency` options in sidekiq.

Related https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/3422

Changelog: removed
2024-05-04 00:39:29 +00:00
Andrew Patterson 7a83ad1d7c Merge branch 'deps/50129a2-a9e482e' into 'master'
Update gitlab-org/build/omnibus-mirror/node_exporter from 1.7.0 to 1.8.0

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

Merged-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Clemens Beck <cbeck@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-05-02 19:51:34 +00:00
deps 242873ad43 Update gitlab-org/container-registry from v3.93.0-gitlab to v4.0.0-gitlab
Changelog: changed
2024-05-02 08:21:39 +00:00
Balasankar 'Balu' C f104a25b3e Merge branch 'deps/e771939-8485688' into 'master'
Update exiftool/exiftool from 12.82 to 12.84

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Clemens Beck <cbeck@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-05-02 07:29:33 +00:00