Commit Graph

17966 Commits

Author SHA1 Message Date
Robert Marshall 4334402cad Merge branch '8490-fix-rat-fips-package-url' into 'master'
Fix RAT_FIPS_PACKAGE_URL not having fips suffix in path

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

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 17:25:00 +00:00
Balasankar 'Balu' C 7eeb584a40
Fix RAT_FIPS_PACKAGE_URL not having fips suffix in path
While generating package information, specify fips argument for FIPS
package URLs. Also ensure the correct package folder is used in those
URLs.

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 15:11:51 +05:30
Balasankar 'Balu' C fecc1240f3
Make package info methods take fips as argument
Package related information can have different values for FIPS packages
and regular packages. For builds, USE_SYSTEM_SSL variable controls if
the FIPS specific information should be used. However, while generating
facts, we need to specifically retreive FIPS specific information too,
in addition to regular one. So, accept fips as an argument to the
relevant methods that can be specified while generating facts.

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 15:08:11 +05:30
Robert Marshall 8264314f7d Merge branch 'docker-buildx-helper' into 'master'
Add foundation to build multiarch images

Closes #8469 and #8470

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Dmytro Makovey <dmakovey@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Reviewed-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 04:14:50 +00:00
Balasankar 'Balu' C ca02e0c220
Enable building arm64 images
Modify the Dockerfile and library code around Docker image builds to
support building multiarch images. The Dockerfile will download the
package for the correct architecture based on TARGETARCH variable.

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

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 08:40:38 +05:30
Balasankar 'Balu' C f8c71c7a9c
Use docker buildx to build Docker images
Move away from docker-api gem which does not have support for `docker
buildx`. Add a wrapper to execute `docker buildx` commands in the shell
and use that for Docker operations.

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

Signed-off-by: Balasankar 'Balu' C <balasankar@gitlab.com>
2024-04-19 08:40:16 +05:30
Jason Plum a068eb2a10 Merge branch 'fix_package_download_url' into 'master'
Fix for missing branch_build_package_download_url

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

Merged-by: Jason Plum <jplum@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Co-authored-by: Andrew Patterson <apatterson@gitlab.com>
2024-04-18 16:38:36 +00:00
Andrew Patterson 887df90300 Fix for missing branch_build_package_download_url
Use Build::Info::CI::package_download_url instead
of the no longer present
Build::Info::CI::branch_build_package_download_url
2024-04-18 08:04:04 -06:00
Brad Sevy 2ad383978a Hyphenate PEM encoded 2024-04-18 13:44:46 +00:00
GitLab Release Tools Bot 1b86ac52ef Update changelog for 16.11.0
[ci skip]
2024-04-17 11:51:37 +00:00
Akis Maziotis 87ecb13f6b
Update Mattermost to 9.7.1
Changelog: other
2024-04-17 14:46:50 +03:00
ngala 1f597136de Update default pages auth-redirect-uri when namespace-in-path is enabled
Related: https://gitlab.com/gitlab-org/gitlab/-/issues/452459+

Changelog: fixed
2024-04-16 14:52:14 +05:30
Robert Marshall 8ea9c2a973 Merge branch 'ngala/pages_namespace_in_path_custom_auth_redirect_uri' into 'master'
Support custom auth_redirect_uri when namespace_in_path is enabled

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Mitchell Nielsen <mnielsen@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: ngala <ngala@gitlab.com>
2024-04-15 23:29:41 +00:00
Naman Jagdish Gala 5bc1b0d5ad Support custom auth_redirect_uri when namespace_in_path is enabled
Related: https://gitlab.com/gitlab-org/gitlab/-/issues/452459

Changelog: fixed
2024-04-15 23:29:41 +00:00
Andrew Patterson f96ce284b5 Merge branch 'avoid-indefined-local-error' into 'master'
Avoid "undefined local" error in pg-upgrade.rb#analyze_cluster

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

Merged-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Ian Baum <ibaum@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: Katrin Leinweber (GTLB) <kleinweber@gitlab.com>
2024-04-15 19:43:54 +00:00
Robert Marshall 9f89bce2e7 Merge branch 'enable-kas-in-fips-mode' into 'master'
Enable KAS in FIPS mode

Closes gitlab-org/build/CNG#1948

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Vishal Patel <vpatel@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Taka Nishida <tnishida@gitlab.com>
2024-04-15 19:41:06 +00:00
Taka Nishida 10d69a4d34 Enable KAS in FIPS mode
- Removes code that blocked KAS service when GitLab is
  deployed in FIPS mode

Related https://gitlab.com/gitlab-org/gitlab/-/issues/375327

Changelog: changed
2024-04-15 19:41:05 +00:00
Andrew Patterson 0f8dfff4b4 Merge branch 'Alexand-master-patch-21048' into 'master'
Add link to how to test KAS with TLS

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

Merged-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Hossein Pursultani <hpursultani@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Co-authored-by: João Alexandre Cunha <j.a.cunha@gmail.com>
2024-04-15 16:08:33 +00:00
Balasankar 'Balu' C 7ef97c1842 Merge branch 'deps/19dfc8b-7cc4b82' into 'master'
Update gitlab-org/container-registry from v3.90.0-gitlab to v3.92.0-gitlab

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

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-04-15 09:38:15 +00:00
dependencies.io Bot 28e54f0367 Update container-registry from to v3.92.0-gitlab
Changelog: changed
2024-04-15 09:38:14 +00:00
Balasankar 'Balu' C afccdd4968 Merge branch 'sh-allow-redis-multiple-bind' into 'master'
Accept multiple bind addresses in Redis config

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Hossein Pursultani <hpursultani@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-04-15 05:28:38 +00:00
Robert Marshall 80911c588b Merge branch 'revert-curl-8.7.1-upgrade' into 'master'
Revert "Update curl/curl from curl-8_6_0 to curl-8_7_1"

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Stan Hu <stanhu@gmail.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Ryan Egesdahl <deriamis@gmail.com>
2024-04-13 07:27:15 +00:00
Ryan Egesdahl 7660dadb1d
Revert "Update curl/curl from curl-8_6_0 to curl-8_7_1"
This reverts commit 7c0841da37.
2024-04-12 22:09:53 -07:00
GitLab Release Tools Bot f44a3ecc49 Update changelog for 16.8.7
[ci skip]
2024-04-12 22:00:39 +00:00
GitLab Release Tools Bot fc379ad72c Update changelog for 16.9.5
[ci skip]
2024-04-12 21:51:02 +00:00
GitLab Release Tools Bot 3baf7b662b Update changelog for 16.10.3
[ci skip]
2024-04-12 21:27:23 +00:00
Robert Marshall 81b5d1485b Merge branch 'deps/69b928e-06f4868' into 'master'
Update gitlab-org/gitlab-exporter from 14.3.0 to 14.4.0

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

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-04-12 19:48:10 +00:00
dependencies.io Bot 6f9dbc473d Bump gitlab-exporter to version 14.4.0
- Updates gitlab-org/gitlab-exporter from 14.3.0 to 14.4.0

Changelog: changed
2024-04-12 19:48:10 +00:00
Jason Plum 56a4a0547a Merge branch 'sh-fix-patroni' into 'master'
Fix patroni no longer working with update to ydiff 1.3

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

Merged-by: Jason Plum <jplum@gitlab.com>
Approved-by: Jason Plum <jplum@gitlab.com>
Approved-by: João Alexandre Cunha <j.a.cunha@gmail.com>
Co-authored-by: Stan Hu <stanhu@gmail.com>
2024-04-12 18:22:54 +00:00
Stan Hu a17b4c868b
Fix patroni no longer working with update to ydiff 1.3
ydiff 1.3.0 was released on April 2, 2024
(https://pypi.org/project/ydiff/#history), and the patroni install
quietly updated to ydiff 1.3.0 from 1.2.0.

https://github.com/zalando/patroni/blob/v3.0.1/requirements.txt#L15
allows any version of ydiff above 1.2.0, but as described in
634b44ee05/docs/releases.rst (L16)
ydiff 1.3 requires the cdiff module.

To fix this problem, pin the version of ydiff to 1.2.0 until
we can upgrade patroni.

Changelog: fixed
2024-04-12 09:38:10 -07:00
Balasankar 'Balu' C 42e34c1855 Merge branch 'deps/cf38390-a739d3d' into 'master'
Update gitlab-org/build/omnibus-mirror/prometheus from 2.51.0 to 2.51.2

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

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-04-12 13:18:28 +00:00
dependencies.io Bot 293d8f88f5 Update prometheus from 2.51.0 to 2.51.2
Changelog: changed
2024-04-12 13:18:28 +00:00
Balasankar 'Balu' C 616507d101 Merge branch 'deps/d482c13-f4be207' into 'master'
Update gitlab-org/build/omnibus-mirror/pgbouncer_exporter from 0.7.0 to 0.8.0

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

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-04-12 10:57:44 +00:00
dependencies.io Bot 832832e17d Update pgbouncer_exporter to 0.8.0
Changelog: changed
2024-04-12 10:57:44 +00:00
Balasankar 'Balu' C 14d0ed8366 Merge branch 'bump-mattermost-9.6.1' into 'master'
Bump Mattermost to release 9.6.1

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Mario Vitale <mvitale1989@hotmail.com>
2024-04-12 10:57:08 +00:00
mvitale1989 a136bbd80c Bump Mattermost to release 9.6.1
Changelog: changed
2024-04-12 10:57:08 +00:00
Robert Marshall cacb8bef4f Merge branch '8487-builder-image-v5.10.0' into 'master'
Bump builder image to 5.10.0

Closes #8487

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Ryan Egesdahl <deriamis@gmail.com>
2024-04-12 07:45:32 +00:00
Ryan Egesdahl 1cdddc9dd4 Bump builder image to 5.10.0
- Upgrades Golang to version 1.21.9

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

Changelog: changed
2024-04-12 07:45:31 +00:00
Katrin Leinweber (GTLB) 0eaa7e61d4 Avoid "undefined local" error (follow-up to 0faf786f)
Changelog: fixed
2024-04-11 15:13:32 +02:00
Robert Marshall ca5db61025 Merge branch 'deps/4225d27-054101b' into 'master'
Update rubygems/rubygems from 3.5.6 to 3.5.7

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Jon Doveston <jdoveston@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Clemens Beck <cbeck@gitlab.com>
Co-authored-by: deps <bot@dependencies.io>
2024-04-11 03:34:02 +00:00
dependencies.io Bot ebe3efc332 Bump rubygems to version 3.5.7
- Updates rubygems/rubygems from 3.5.6 to 3.5.7

Changelog: changed
2024-04-11 03:34:02 +00:00
Robert Marshall 57d2bf8538 Merge branch 'add-grpc-level-config-for-kas' into 'master'
Support optional grpc log level config for KAS

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

Merged-by: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Gabriel Mazetto <gabriel@gitlab.com>
Approved-by: Robert Marshall <rmarshall@gitlab.com>
Co-authored-by: Taka Nishida <tnishida@gitlab.com>
2024-04-10 21:20:33 +00:00
Taka Nishida eacda21e30 Support optional grpc log level config for KAS
Adds the gitlab_kas['grpc_log_level'] config option.

Changelog: added
2024-04-10 21:20:33 +00:00
João Alexandre Cunha d9e0e335ce Add link to how to test KAS with TLS 2024-04-10 19:27:06 +00:00
GitLab Release Tools Bot d460571abf Merge remote-tracking branch 'dev/master' 2024-04-10 17:25:57 +00:00
Andrew Patterson 549bad1b02 Merge branch 'deps/c55ce6f-74825d8' into 'master'
Update curl/curl from curl-8_6_0 to curl-8_7_1

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

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-04-10 17:21:38 +00:00
GitLab Bot aeb26d404e Automatic merge of gitlab-org/omnibus-gitlab master 2024-04-09 19:05:34 +00:00
Balasankar 'Balu' C f8b5137101 Merge branch 'sc1-add-shard-to-routing-rule' into 'master'
Allow routing rules to contain shard information

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

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Mitchell Nielsen <mnielsen@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Sylvester Chin <schin@gitlab.com>
2024-04-09 17:25:41 +00:00
Sylvester Chin f185f8373c Allow routing rules to contain shard information
Changelog: changed
2024-04-09 17:25:41 +00:00
GitLab Release Tools Bot 33f2b8005c Update changelog for 16.8.6
[ci skip]
2024-04-09 17:21:32 +00:00