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: Robert Marshall <rmarshall@gitlab.com>
Approved-by: Ryan Egesdahl <regesdahl@gitlab.com>

.gitlab-ci.yml

@@ -37,7 +37,7 @@ variables:
   # To be used for images that exist only on dev.gitlab.org
   DEV_BUILDER_IMAGE_REGISTRY: 'dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder'
   PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
-  BUILDER_IMAGE_REVISION: "5.10.0"
+  BUILDER_IMAGE_REVISION: "5.12.0"
   # The registry to pull the assets image from
   ASSET_REGISTRY: "${CI_REGISTRY}"
   ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"

config/patches/acme-client/add-license-file.patch

@@ -1,27 +0,0 @@
-diff --git a/LICENSE.txt b/LICENSE.txt
-new file mode 100644
-index 0000000..73b96b4
---- /dev/null
-+++ b/LICENSE.txt
-@@ -0,0 +1,21 @@
-+The MIT License (MIT)
-+
-+Copyright (c) 2015 Charles Barbier
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.

config/patches/chef-bin/add-license-file.patch

@@ -1,207 +0,0 @@
-diff --git a/LICENSE b/LICENSE
-new file mode 100644
-index 0000000..11069ed
---- /dev/null
-+++ b/LICENSE
-@@ -0,0 +1,201 @@
-+                              Apache License
-+                        Version 2.0, January 2004
-+                     http://www.apache.org/licenses/
-+
-+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+1. Definitions.
-+
-+   "License" shall mean the terms and conditions for use, reproduction,
-+   and distribution as defined by Sections 1 through 9 of this document.
-+
-+   "Licensor" shall mean the copyright owner or entity authorized by
-+   the copyright owner that is granting the License.
-+
-+   "Legal Entity" shall mean the union of the acting entity and all
-+   other entities that control, are controlled by, or are under common
-+   control with that entity. For the purposes of this definition,
-+   "control" means (i) the power, direct or indirect, to cause the
-+   direction or management of such entity, whether by contract or
-+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-+   outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+   "You" (or "Your") shall mean an individual or Legal Entity
-+   exercising permissions granted by this License.
-+
-+   "Source" form shall mean the preferred form for making modifications,
-+   including but not limited to software source code, documentation
-+   source, and configuration files.
-+
-+   "Object" form shall mean any form resulting from mechanical
-+   transformation or translation of a Source form, including but
-+   not limited to compiled object code, generated documentation,
-+   and conversions to other media types.
-+
-+   "Work" shall mean the work of authorship, whether in Source or
-+   Object form, made available under the License, as indicated by a
-+   copyright notice that is included in or attached to the work
-+   (an example is provided in the Appendix below).
-+
-+   "Derivative Works" shall mean any work, whether in Source or Object
-+   form, that is based on (or derived from) the Work and for which the
-+   editorial revisions, annotations, elaborations, or other modifications
-+   represent, as a whole, an original work of authorship. For the purposes
-+   of this License, Derivative Works shall not include works that remain
-+   separable from, or merely link (or bind by name) to the interfaces of,
-+   the Work and Derivative Works thereof.
-+
-+   "Contribution" shall mean any work of authorship, including
-+   the original version of the Work and any modifications or additions
-+   to that Work or Derivative Works thereof, that is intentionally
-+   submitted to Licensor for inclusion in the Work by the copyright owner
-+   or by an individual or Legal Entity authorized to submit on behalf of
-+   the copyright owner. For the purposes of this definition, "submitted"
-+   means any form of electronic, verbal, or written communication sent
-+   to the Licensor or its representatives, including but not limited to
-+   communication on electronic mailing lists, source code control systems,
-+   and issue tracking systems that are managed by, or on behalf of, the
-+   Licensor for the purpose of discussing and improving the Work, but
-+   excluding communication that is conspicuously marked or otherwise
-+   designated in writing by the copyright owner as "Not a Contribution."
-+
-+   "Contributor" shall mean Licensor and any individual or Legal Entity
-+   on behalf of whom a Contribution has been received by Licensor and
-+   subsequently incorporated within the Work.
-+
-+2. Grant of Copyright License. Subject to the terms and conditions of
-+   this License, each Contributor hereby grants to You a perpetual,
-+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+   copyright license to reproduce, prepare Derivative Works of,
-+   publicly display, publicly perform, sublicense, and distribute the
-+   Work and such Derivative Works in Source or Object form.
-+
-+3. Grant of Patent License. Subject to the terms and conditions of
-+   this License, each Contributor hereby grants to You a perpetual,
-+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+   (except as stated in this section) patent license to make, have made,
-+   use, offer to sell, sell, import, and otherwise transfer the Work,
-+   where such license applies only to those patent claims licensable
-+   by such Contributor that are necessarily infringed by their
-+   Contribution(s) alone or by combination of their Contribution(s)
-+   with the Work to which such Contribution(s) was submitted. If You
-+   institute patent litigation against any entity (including a
-+   cross-claim or counterclaim in a lawsuit) alleging that the Work
-+   or a Contribution incorporated within the Work constitutes direct
-+   or contributory patent infringement, then any patent licenses
-+   granted to You under this License for that Work shall terminate
-+   as of the date such litigation is filed.
-+
-+4. Redistribution. You may reproduce and distribute copies of the
-+   Work or Derivative Works thereof in any medium, with or without
-+   modifications, and in Source or Object form, provided that You
-+   meet the following conditions:
-+
-+   (a) You must give any other recipients of the Work or
-+       Derivative Works a copy of this License; and
-+
-+   (b) You must cause any modified files to carry prominent notices
-+       stating that You changed the files; and
-+
-+   (c) You must retain, in the Source form of any Derivative Works
-+       that You distribute, all copyright, patent, trademark, and
-+       attribution notices from the Source form of the Work,
-+       excluding those notices that do not pertain to any part of
-+       the Derivative Works; and
-+
-+   (d) If the Work includes a "NOTICE" text file as part of its
-+       distribution, then any Derivative Works that You distribute must
-+       include a readable copy of the attribution notices contained
-+       within such NOTICE file, excluding those notices that do not
-+       pertain to any part of the Derivative Works, in at least one
-+       of the following places: within a NOTICE text file distributed
-+       as part of the Derivative Works; within the Source form or
-+       documentation, if provided along with the Derivative Works; or,
-+       within a display generated by the Derivative Works, if and
-+       wherever such third-party notices normally appear. The contents
-+       of the NOTICE file are for informational purposes only and
-+       do not modify the License. You may add Your own attribution
-+       notices within Derivative Works that You distribute, alongside
-+       or as an addendum to the NOTICE text from the Work, provided
-+       that such additional attribution notices cannot be construed
-+       as modifying the License.
-+
-+   You may add Your own copyright statement to Your modifications and
-+   may provide additional or different license terms and conditions
-+   for use, reproduction, or distribution of Your modifications, or
-+   for any such Derivative Works as a whole, provided Your use,
-+   reproduction, and distribution of the Work otherwise complies with
-+   the conditions stated in this License.
-+
-+5. Submission of Contributions. Unless You explicitly state otherwise,
-+   any Contribution intentionally submitted for inclusion in the Work
-+   by You to the Licensor shall be under the terms and conditions of
-+   this License, without any additional terms or conditions.
-+   Notwithstanding the above, nothing herein shall supersede or modify
-+   the terms of any separate license agreement you may have executed
-+   with Licensor regarding such Contributions.
-+
-+6. Trademarks. This License does not grant permission to use the trade
-+   names, trademarks, service marks, or product names of the Licensor,
-+   except as required for reasonable and customary use in describing the
-+   origin of the Work and reproducing the content of the NOTICE file.
-+
-+7. Disclaimer of Warranty. Unless required by applicable law or
-+   agreed to in writing, Licensor provides the Work (and each
-+   Contributor provides its Contributions) on an "AS IS" BASIS,
-+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+   implied, including, without limitation, any warranties or conditions
-+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-+   PARTICULAR PURPOSE. You are solely responsible for determining the
-+   appropriateness of using or redistributing the Work and assume any
-+   risks associated with Your exercise of permissions under this License.
-+
-+8. Limitation of Liability. In no event and under no legal theory,
-+   whether in tort (including negligence), contract, or otherwise,
-+   unless required by applicable law (such as deliberate and grossly
-+   negligent acts) or agreed to in writing, shall any Contributor be
-+   liable to You for damages, including any direct, indirect, special,
-+   incidental, or consequential damages of any character arising as a
-+   result of this License or out of the use or inability to use the
-+   Work (including but not limited to damages for loss of goodwill,
-+   work stoppage, computer failure or malfunction, or any and all
-+   other commercial damages or losses), even if such Contributor
-+   has been advised of the possibility of such damages.
-+
-+9. Accepting Warranty or Additional Liability. While redistributing
-+   the Work or Derivative Works thereof, You may choose to offer,
-+   and charge a fee for, acceptance of support, warranty, indemnity,
-+   or other liability obligations and/or rights consistent with this
-+   License. However, in accepting such obligations, You may act only
-+   on Your own behalf and on Your sole responsibility, not on behalf
-+   of any other Contributor, and only if You agree to indemnify,
-+   defend, and hold each Contributor harmless for any liability
-+   incurred by, or claims asserted against, such Contributor by reason
-+   of your accepting any such warranty or additional liability.
-+
-+END OF TERMS AND CONDITIONS
-+
-+APPENDIX: How to apply the Apache License to your work.
-+
-+   To apply the Apache License to your work, attach the following
-+   boilerplate notice, with the fields enclosed by brackets "[]"
-+   replaced with your own identifying information. (Don't include
-+   the brackets!)  The text should be enclosed in the appropriate
-+   comment syntax for the file format. We also recommend that a
-+   file or class name and description of purpose be included on the
-+   same "printed page" as the copyright notice for easier
-+   identification within third-party archives.
-+
-+Copyright [yyyy] [name of copyright owner]
-+
-+Licensed under the Apache License, Version 2.0 (the "License");
-+you may not use this file except in compliance with the License.
-+You may obtain a copy of the License at
-+
-+    http://www.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+See the License for the specific language governing permissions and
-+limitations under the License.

config/patches/chef-zero/license/add-license-file.patch

@@ -1,207 +0,0 @@
-diff --git a/LICENSE b/LICENSE
-new file mode 100644
-index 0000000..11069ed
---- /dev/null
-+++ b/LICENSE
-@@ -0,0 +1,201 @@
-+                              Apache License
-+                        Version 2.0, January 2004
-+                     http://www.apache.org/licenses/
-+
-+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+1. Definitions.
-+
-+   "License" shall mean the terms and conditions for use, reproduction,
-+   and distribution as defined by Sections 1 through 9 of this document.
-+
-+   "Licensor" shall mean the copyright owner or entity authorized by
-+   the copyright owner that is granting the License.
-+
-+   "Legal Entity" shall mean the union of the acting entity and all
-+   other entities that control, are controlled by, or are under common
-+   control with that entity. For the purposes of this definition,
-+   "control" means (i) the power, direct or indirect, to cause the
-+   direction or management of such entity, whether by contract or
-+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-+   outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+   "You" (or "Your") shall mean an individual or Legal Entity
-+   exercising permissions granted by this License.
-+
-+   "Source" form shall mean the preferred form for making modifications,
-+   including but not limited to software source code, documentation
-+   source, and configuration files.
-+
-+   "Object" form shall mean any form resulting from mechanical
-+   transformation or translation of a Source form, including but
-+   not limited to compiled object code, generated documentation,
-+   and conversions to other media types.
-+
-+   "Work" shall mean the work of authorship, whether in Source or
-+   Object form, made available under the License, as indicated by a
-+   copyright notice that is included in or attached to the work
-+   (an example is provided in the Appendix below).
-+
-+   "Derivative Works" shall mean any work, whether in Source or Object
-+   form, that is based on (or derived from) the Work and for which the
-+   editorial revisions, annotations, elaborations, or other modifications
-+   represent, as a whole, an original work of authorship. For the purposes
-+   of this License, Derivative Works shall not include works that remain
-+   separable from, or merely link (or bind by name) to the interfaces of,
-+   the Work and Derivative Works thereof.
-+
-+   "Contribution" shall mean any work of authorship, including
-+   the original version of the Work and any modifications or additions
-+   to that Work or Derivative Works thereof, that is intentionally
-+   submitted to Licensor for inclusion in the Work by the copyright owner
-+   or by an individual or Legal Entity authorized to submit on behalf of
-+   the copyright owner. For the purposes of this definition, "submitted"
-+   means any form of electronic, verbal, or written communication sent
-+   to the Licensor or its representatives, including but not limited to
-+   communication on electronic mailing lists, source code control systems,
-+   and issue tracking systems that are managed by, or on behalf of, the
-+   Licensor for the purpose of discussing and improving the Work, but
-+   excluding communication that is conspicuously marked or otherwise
-+   designated in writing by the copyright owner as "Not a Contribution."
-+
-+   "Contributor" shall mean Licensor and any individual or Legal Entity
-+   on behalf of whom a Contribution has been received by Licensor and
-+   subsequently incorporated within the Work.
-+
-+2. Grant of Copyright License. Subject to the terms and conditions of
-+   this License, each Contributor hereby grants to You a perpetual,
-+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+   copyright license to reproduce, prepare Derivative Works of,
-+   publicly display, publicly perform, sublicense, and distribute the
-+   Work and such Derivative Works in Source or Object form.
-+
-+3. Grant of Patent License. Subject to the terms and conditions of
-+   this License, each Contributor hereby grants to You a perpetual,
-+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+   (except as stated in this section) patent license to make, have made,
-+   use, offer to sell, sell, import, and otherwise transfer the Work,
-+   where such license applies only to those patent claims licensable
-+   by such Contributor that are necessarily infringed by their
-+   Contribution(s) alone or by combination of their Contribution(s)
-+   with the Work to which such Contribution(s) was submitted. If You
-+   institute patent litigation against any entity (including a
-+   cross-claim or counterclaim in a lawsuit) alleging that the Work
-+   or a Contribution incorporated within the Work constitutes direct
-+   or contributory patent infringement, then any patent licenses
-+   granted to You under this License for that Work shall terminate
-+   as of the date such litigation is filed.
-+
-+4. Redistribution. You may reproduce and distribute copies of the
-+   Work or Derivative Works thereof in any medium, with or without
-+   modifications, and in Source or Object form, provided that You
-+   meet the following conditions:
-+
-+   (a) You must give any other recipients of the Work or
-+       Derivative Works a copy of this License; and
-+
-+   (b) You must cause any modified files to carry prominent notices
-+       stating that You changed the files; and
-+
-+   (c) You must retain, in the Source form of any Derivative Works
-+       that You distribute, all copyright, patent, trademark, and
-+       attribution notices from the Source form of the Work,
-+       excluding those notices that do not pertain to any part of
-+       the Derivative Works; and
-+
-+   (d) If the Work includes a "NOTICE" text file as part of its
-+       distribution, then any Derivative Works that You distribute must
-+       include a readable copy of the attribution notices contained
-+       within such NOTICE file, excluding those notices that do not
-+       pertain to any part of the Derivative Works, in at least one
-+       of the following places: within a NOTICE text file distributed
-+       as part of the Derivative Works; within the Source form or
-+       documentation, if provided along with the Derivative Works; or,
-+       within a display generated by the Derivative Works, if and
-+       wherever such third-party notices normally appear. The contents
-+       of the NOTICE file are for informational purposes only and
-+       do not modify the License. You may add Your own attribution
-+       notices within Derivative Works that You distribute, alongside
-+       or as an addendum to the NOTICE text from the Work, provided
-+       that such additional attribution notices cannot be construed
-+       as modifying the License.
-+
-+   You may add Your own copyright statement to Your modifications and
-+   may provide additional or different license terms and conditions
-+   for use, reproduction, or distribution of Your modifications, or
-+   for any such Derivative Works as a whole, provided Your use,
-+   reproduction, and distribution of the Work otherwise complies with
-+   the conditions stated in this License.
-+
-+5. Submission of Contributions. Unless You explicitly state otherwise,
-+   any Contribution intentionally submitted for inclusion in the Work
-+   by You to the Licensor shall be under the terms and conditions of
-+   this License, without any additional terms or conditions.
-+   Notwithstanding the above, nothing herein shall supersede or modify
-+   the terms of any separate license agreement you may have executed
-+   with Licensor regarding such Contributions.
-+
-+6. Trademarks. This License does not grant permission to use the trade
-+   names, trademarks, service marks, or product names of the Licensor,
-+   except as required for reasonable and customary use in describing the
-+   origin of the Work and reproducing the content of the NOTICE file.
-+
-+7. Disclaimer of Warranty. Unless required by applicable law or
-+   agreed to in writing, Licensor provides the Work (and each
-+   Contributor provides its Contributions) on an "AS IS" BASIS,
-+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+   implied, including, without limitation, any warranties or conditions
-+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-+   PARTICULAR PURPOSE. You are solely responsible for determining the
-+   appropriateness of using or redistributing the Work and assume any
-+   risks associated with Your exercise of permissions under this License.
-+
-+8. Limitation of Liability. In no event and under no legal theory,
-+   whether in tort (including negligence), contract, or otherwise,
-+   unless required by applicable law (such as deliberate and grossly
-+   negligent acts) or agreed to in writing, shall any Contributor be
-+   liable to You for damages, including any direct, indirect, special,
-+   incidental, or consequential damages of any character arising as a
-+   result of this License or out of the use or inability to use the
-+   Work (including but not limited to damages for loss of goodwill,
-+   work stoppage, computer failure or malfunction, or any and all
-+   other commercial damages or losses), even if such Contributor
-+   has been advised of the possibility of such damages.
-+
-+9. Accepting Warranty or Additional Liability. While redistributing
-+   the Work or Derivative Works thereof, You may choose to offer,
-+   and charge a fee for, acceptance of support, warranty, indemnity,
-+   or other liability obligations and/or rights consistent with this
-+   License. However, in accepting such obligations, You may act only
-+   on Your own behalf and on Your sole responsibility, not on behalf
-+   of any other Contributor, and only if You agree to indemnify,
-+   defend, and hold each Contributor harmless for any liability
-+   incurred by, or claims asserted against, such Contributor by reason
-+   of your accepting any such warranty or additional liability.
-+
-+END OF TERMS AND CONDITIONS
-+
-+APPENDIX: How to apply the Apache License to your work.
-+
-+   To apply the Apache License to your work, attach the following
-+   boilerplate notice, with the fields enclosed by brackets "[]"
-+   replaced with your own identifying information. (Don't include
-+   the brackets!)  The text should be enclosed in the appropriate
-+   comment syntax for the file format. We also recommend that a
-+   file or class name and description of purpose be included on the
-+   same "printed page" as the copyright notice for easier
-+   identification within third-party archives.
-+
-+Copyright [yyyy] [name of copyright owner]
-+
-+Licensed under the Apache License, Version 2.0 (the "License");
-+you may not use this file except in compliance with the License.
-+You may obtain a copy of the License at
-+
-+    http://www.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+See the License for the specific language governing permissions and
-+limitations under the License.

config/patches/mixlib-log/license/add-license-file.patch

@@ -1,207 +0,0 @@
-diff --git a/LICENSE b/LICENSE
-new file mode 100644
-index 0000000..11069ed
---- /dev/null
-+++ b/LICENSE
-@@ -0,0 +1,201 @@
-+                              Apache License
-+                        Version 2.0, January 2004
-+                     http://www.apache.org/licenses/
-+
-+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+1. Definitions.
-+
-+   "License" shall mean the terms and conditions for use, reproduction,
-+   and distribution as defined by Sections 1 through 9 of this document.
-+
-+   "Licensor" shall mean the copyright owner or entity authorized by
-+   the copyright owner that is granting the License.
-+
-+   "Legal Entity" shall mean the union of the acting entity and all
-+   other entities that control, are controlled by, or are under common
-+   control with that entity. For the purposes of this definition,
-+   "control" means (i) the power, direct or indirect, to cause the
-+   direction or management of such entity, whether by contract or
-+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-+   outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+   "You" (or "Your") shall mean an individual or Legal Entity
-+   exercising permissions granted by this License.
-+
-+   "Source" form shall mean the preferred form for making modifications,
-+   including but not limited to software source code, documentation
-+   source, and configuration files.
-+
-+   "Object" form shall mean any form resulting from mechanical
-+   transformation or translation of a Source form, including but
-+   not limited to compiled object code, generated documentation,
-+   and conversions to other media types.
-+
-+   "Work" shall mean the work of authorship, whether in Source or
-+   Object form, made available under the License, as indicated by a
-+   copyright notice that is included in or attached to the work
-+   (an example is provided in the Appendix below).
-+
-+   "Derivative Works" shall mean any work, whether in Source or Object
-+   form, that is based on (or derived from) the Work and for which the
-+   editorial revisions, annotations, elaborations, or other modifications
-+   represent, as a whole, an original work of authorship. For the purposes
-+   of this License, Derivative Works shall not include works that remain
-+   separable from, or merely link (or bind by name) to the interfaces of,
-+   the Work and Derivative Works thereof.
-+
-+   "Contribution" shall mean any work of authorship, including
-+   the original version of the Work and any modifications or additions
-+   to that Work or Derivative Works thereof, that is intentionally
-+   submitted to Licensor for inclusion in the Work by the copyright owner
-+   or by an individual or Legal Entity authorized to submit on behalf of
-+   the copyright owner. For the purposes of this definition, "submitted"
-+   means any form of electronic, verbal, or written communication sent
-+   to the Licensor or its representatives, including but not limited to
-+   communication on electronic mailing lists, source code control systems,
-+   and issue tracking systems that are managed by, or on behalf of, the
-+   Licensor for the purpose of discussing and improving the Work, but
-+   excluding communication that is conspicuously marked or otherwise
-+   designated in writing by the copyright owner as "Not a Contribution."
-+
-+   "Contributor" shall mean Licensor and any individual or Legal Entity
-+   on behalf of whom a Contribution has been received by Licensor and
-+   subsequently incorporated within the Work.
-+
-+2. Grant of Copyright License. Subject to the terms and conditions of
-+   this License, each Contributor hereby grants to You a perpetual,
-+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+   copyright license to reproduce, prepare Derivative Works of,
-+   publicly display, publicly perform, sublicense, and distribute the
-+   Work and such Derivative Works in Source or Object form.
-+
-+3. Grant of Patent License. Subject to the terms and conditions of
-+   this License, each Contributor hereby grants to You a perpetual,
-+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+   (except as stated in this section) patent license to make, have made,
-+   use, offer to sell, sell, import, and otherwise transfer the Work,
-+   where such license applies only to those patent claims licensable
-+   by such Contributor that are necessarily infringed by their
-+   Contribution(s) alone or by combination of their Contribution(s)
-+   with the Work to which such Contribution(s) was submitted. If You
-+   institute patent litigation against any entity (including a
-+   cross-claim or counterclaim in a lawsuit) alleging that the Work
-+   or a Contribution incorporated within the Work constitutes direct
-+   or contributory patent infringement, then any patent licenses
-+   granted to You under this License for that Work shall terminate
-+   as of the date such litigation is filed.
-+
-+4. Redistribution. You may reproduce and distribute copies of the
-+   Work or Derivative Works thereof in any medium, with or without
-+   modifications, and in Source or Object form, provided that You
-+   meet the following conditions:
-+
-+   (a) You must give any other recipients of the Work or
-+       Derivative Works a copy of this License; and
-+
-+   (b) You must cause any modified files to carry prominent notices
-+       stating that You changed the files; and
-+
-+   (c) You must retain, in the Source form of any Derivative Works
-+       that You distribute, all copyright, patent, trademark, and
-+       attribution notices from the Source form of the Work,
-+       excluding those notices that do not pertain to any part of
-+       the Derivative Works; and
-+
-+   (d) If the Work includes a "NOTICE" text file as part of its
-+       distribution, then any Derivative Works that You distribute must
-+       include a readable copy of the attribution notices contained
-+       within such NOTICE file, excluding those notices that do not
-+       pertain to any part of the Derivative Works, in at least one
-+       of the following places: within a NOTICE text file distributed
-+       as part of the Derivative Works; within the Source form or
-+       documentation, if provided along with the Derivative Works; or,
-+       within a display generated by the Derivative Works, if and
-+       wherever such third-party notices normally appear. The contents
-+       of the NOTICE file are for informational purposes only and
-+       do not modify the License. You may add Your own attribution
-+       notices within Derivative Works that You distribute, alongside
-+       or as an addendum to the NOTICE text from the Work, provided
-+       that such additional attribution notices cannot be construed
-+       as modifying the License.
-+
-+   You may add Your own copyright statement to Your modifications and
-+   may provide additional or different license terms and conditions
-+   for use, reproduction, or distribution of Your modifications, or
-+   for any such Derivative Works as a whole, provided Your use,
-+   reproduction, and distribution of the Work otherwise complies with
-+   the conditions stated in this License.
-+
-+5. Submission of Contributions. Unless You explicitly state otherwise,
-+   any Contribution intentionally submitted for inclusion in the Work
-+   by You to the Licensor shall be under the terms and conditions of
-+   this License, without any additional terms or conditions.
-+   Notwithstanding the above, nothing herein shall supersede or modify
-+   the terms of any separate license agreement you may have executed
-+   with Licensor regarding such Contributions.
-+
-+6. Trademarks. This License does not grant permission to use the trade
-+   names, trademarks, service marks, or product names of the Licensor,
-+   except as required for reasonable and customary use in describing the
-+   origin of the Work and reproducing the content of the NOTICE file.
-+
-+7. Disclaimer of Warranty. Unless required by applicable law or
-+   agreed to in writing, Licensor provides the Work (and each
-+   Contributor provides its Contributions) on an "AS IS" BASIS,
-+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+   implied, including, without limitation, any warranties or conditions
-+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-+   PARTICULAR PURPOSE. You are solely responsible for determining the
-+   appropriateness of using or redistributing the Work and assume any
-+   risks associated with Your exercise of permissions under this License.
-+
-+8. Limitation of Liability. In no event and under no legal theory,
-+   whether in tort (including negligence), contract, or otherwise,
-+   unless required by applicable law (such as deliberate and grossly
-+   negligent acts) or agreed to in writing, shall any Contributor be
-+   liable to You for damages, including any direct, indirect, special,
-+   incidental, or consequential damages of any character arising as a
-+   result of this License or out of the use or inability to use the
-+   Work (including but not limited to damages for loss of goodwill,
-+   work stoppage, computer failure or malfunction, or any and all
-+   other commercial damages or losses), even if such Contributor
-+   has been advised of the possibility of such damages.
-+
-+9. Accepting Warranty or Additional Liability. While redistributing
-+   the Work or Derivative Works thereof, You may choose to offer,
-+   and charge a fee for, acceptance of support, warranty, indemnity,
-+   or other liability obligations and/or rights consistent with this
-+   License. However, in accepting such obligations, You may act only
-+   on Your own behalf and on Your sole responsibility, not on behalf
-+   of any other Contributor, and only if You agree to indemnify,
-+   defend, and hold each Contributor harmless for any liability
-+   incurred by, or claims asserted against, such Contributor by reason
-+   of your accepting any such warranty or additional liability.
-+
-+END OF TERMS AND CONDITIONS
-+
-+APPENDIX: How to apply the Apache License to your work.
-+
-+   To apply the Apache License to your work, attach the following
-+   boilerplate notice, with the fields enclosed by brackets "[]"
-+   replaced with your own identifying information. (Don't include
-+   the brackets!)  The text should be enclosed in the appropriate
-+   comment syntax for the file format. We also recommend that a
-+   file or class name and description of purpose be included on the
-+   same "printed page" as the copyright notice for easier
-+   identification within third-party archives.
-+
-+Copyright [yyyy] [name of copyright owner]
-+
-+Licensed under the Apache License, Version 2.0 (the "License");
-+you may not use this file except in compliance with the License.
-+You may obtain a copy of the License at
-+
-+    http://www.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+See the License for the specific language governing permissions and
-+limitations under the License.

config/patches/mixlib-log/license/add-notice-file.patch

@@ -1,34 +0,0 @@
-diff --git a/NOTICE b/NOTICE
-new file mode 100644
-index 000000000..d5ba52299
---- /dev/null
-+++ b/NOTICE
-@@ -0,0 +1,28 @@
-+============
-+Mixin::Log Notices
-+============
-+
-+Developed at Chef (http://www.chef.io).
-+
-+
-+ * Copyright 2009-2016, Chef Software, Inc. <legal@chef.io>
-+
-+Mixin::Log incorporates code from Chef.  The Chef notice file follows:
-+
-+============
-+Chef Notices
-+============
-+
-+Developed at Chef (http://www.chef.io).
-+
-+Contributors and Copyright holders:
-+
-+ * Copyright 2008, Adam Jacob <adam@chef.io>
-+ * Copyright 2008, Arjuna Christensen <aj@hjksolutions.com>
-+ * Copyright 2008, Bryan McLellan <btm@loftninjas.org>
-+ * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com>
-+ * Copyright 2009, Sean Cribbs <seancribbs@gmail.com>
-+ * Copyright 2009, Christopher Brown <cb@chef.io>
-+ * Copyright 2009, Thom May <thom@clearairturbulence.org>
-+
-+Chef incorporates code modified from Open4 (http://www.codeforpeople.com/lib/ruby/open4/), which was written by Ara T. Howard.

config/patches/ohai/license/add-license-file.patch

@@ -1,207 +0,0 @@
-diff --git a/LICENSE b/LICENSE
-new file mode 100644
-index 0000000..11069ed
---- /dev/null
-+++ b/LICENSE
-@@ -0,0 +1,201 @@
-+                              Apache License
-+                        Version 2.0, January 2004
-+                     http://www.apache.org/licenses/
-+
-+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-+
-+1. Definitions.
-+
-+   "License" shall mean the terms and conditions for use, reproduction,
-+   and distribution as defined by Sections 1 through 9 of this document.
-+
-+   "Licensor" shall mean the copyright owner or entity authorized by
-+   the copyright owner that is granting the License.
-+
-+   "Legal Entity" shall mean the union of the acting entity and all
-+   other entities that control, are controlled by, or are under common
-+   control with that entity. For the purposes of this definition,
-+   "control" means (i) the power, direct or indirect, to cause the
-+   direction or management of such entity, whether by contract or
-+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-+   outstanding shares, or (iii) beneficial ownership of such entity.
-+
-+   "You" (or "Your") shall mean an individual or Legal Entity
-+   exercising permissions granted by this License.
-+
-+   "Source" form shall mean the preferred form for making modifications,
-+   including but not limited to software source code, documentation
-+   source, and configuration files.
-+
-+   "Object" form shall mean any form resulting from mechanical
-+   transformation or translation of a Source form, including but
-+   not limited to compiled object code, generated documentation,
-+   and conversions to other media types.
-+
-+   "Work" shall mean the work of authorship, whether in Source or
-+   Object form, made available under the License, as indicated by a
-+   copyright notice that is included in or attached to the work
-+   (an example is provided in the Appendix below).
-+
-+   "Derivative Works" shall mean any work, whether in Source or Object
-+   form, that is based on (or derived from) the Work and for which the
-+   editorial revisions, annotations, elaborations, or other modifications
-+   represent, as a whole, an original work of authorship. For the purposes
-+   of this License, Derivative Works shall not include works that remain
-+   separable from, or merely link (or bind by name) to the interfaces of,
-+   the Work and Derivative Works thereof.
-+
-+   "Contribution" shall mean any work of authorship, including
-+   the original version of the Work and any modifications or additions
-+   to that Work or Derivative Works thereof, that is intentionally
-+   submitted to Licensor for inclusion in the Work by the copyright owner
-+   or by an individual or Legal Entity authorized to submit on behalf of
-+   the copyright owner. For the purposes of this definition, "submitted"
-+   means any form of electronic, verbal, or written communication sent
-+   to the Licensor or its representatives, including but not limited to
-+   communication on electronic mailing lists, source code control systems,
-+   and issue tracking systems that are managed by, or on behalf of, the
-+   Licensor for the purpose of discussing and improving the Work, but
-+   excluding communication that is conspicuously marked or otherwise
-+   designated in writing by the copyright owner as "Not a Contribution."
-+
-+   "Contributor" shall mean Licensor and any individual or Legal Entity
-+   on behalf of whom a Contribution has been received by Licensor and
-+   subsequently incorporated within the Work.
-+
-+2. Grant of Copyright License. Subject to the terms and conditions of
-+   this License, each Contributor hereby grants to You a perpetual,
-+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+   copyright license to reproduce, prepare Derivative Works of,
-+   publicly display, publicly perform, sublicense, and distribute the
-+   Work and such Derivative Works in Source or Object form.
-+
-+3. Grant of Patent License. Subject to the terms and conditions of
-+   this License, each Contributor hereby grants to You a perpetual,
-+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-+   (except as stated in this section) patent license to make, have made,
-+   use, offer to sell, sell, import, and otherwise transfer the Work,
-+   where such license applies only to those patent claims licensable
-+   by such Contributor that are necessarily infringed by their
-+   Contribution(s) alone or by combination of their Contribution(s)
-+   with the Work to which such Contribution(s) was submitted. If You
-+   institute patent litigation against any entity (including a
-+   cross-claim or counterclaim in a lawsuit) alleging that the Work
-+   or a Contribution incorporated within the Work constitutes direct
-+   or contributory patent infringement, then any patent licenses
-+   granted to You under this License for that Work shall terminate
-+   as of the date such litigation is filed.
-+
-+4. Redistribution. You may reproduce and distribute copies of the
-+   Work or Derivative Works thereof in any medium, with or without
-+   modifications, and in Source or Object form, provided that You
-+   meet the following conditions:
-+
-+   (a) You must give any other recipients of the Work or
-+       Derivative Works a copy of this License; and
-+
-+   (b) You must cause any modified files to carry prominent notices
-+       stating that You changed the files; and
-+
-+   (c) You must retain, in the Source form of any Derivative Works
-+       that You distribute, all copyright, patent, trademark, and
-+       attribution notices from the Source form of the Work,
-+       excluding those notices that do not pertain to any part of
-+       the Derivative Works; and
-+
-+   (d) If the Work includes a "NOTICE" text file as part of its
-+       distribution, then any Derivative Works that You distribute must
-+       include a readable copy of the attribution notices contained
-+       within such NOTICE file, excluding those notices that do not
-+       pertain to any part of the Derivative Works, in at least one
-+       of the following places: within a NOTICE text file distributed
-+       as part of the Derivative Works; within the Source form or
-+       documentation, if provided along with the Derivative Works; or,
-+       within a display generated by the Derivative Works, if and
-+       wherever such third-party notices normally appear. The contents
-+       of the NOTICE file are for informational purposes only and
-+       do not modify the License. You may add Your own attribution
-+       notices within Derivative Works that You distribute, alongside
-+       or as an addendum to the NOTICE text from the Work, provided
-+       that such additional attribution notices cannot be construed
-+       as modifying the License.
-+
-+   You may add Your own copyright statement to Your modifications and
-+   may provide additional or different license terms and conditions
-+   for use, reproduction, or distribution of Your modifications, or
-+   for any such Derivative Works as a whole, provided Your use,
-+   reproduction, and distribution of the Work otherwise complies with
-+   the conditions stated in this License.
-+
-+5. Submission of Contributions. Unless You explicitly state otherwise,
-+   any Contribution intentionally submitted for inclusion in the Work
-+   by You to the Licensor shall be under the terms and conditions of
-+   this License, without any additional terms or conditions.
-+   Notwithstanding the above, nothing herein shall supersede or modify
-+   the terms of any separate license agreement you may have executed
-+   with Licensor regarding such Contributions.
-+
-+6. Trademarks. This License does not grant permission to use the trade
-+   names, trademarks, service marks, or product names of the Licensor,
-+   except as required for reasonable and customary use in describing the
-+   origin of the Work and reproducing the content of the NOTICE file.
-+
-+7. Disclaimer of Warranty. Unless required by applicable law or
-+   agreed to in writing, Licensor provides the Work (and each
-+   Contributor provides its Contributions) on an "AS IS" BASIS,
-+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-+   implied, including, without limitation, any warranties or conditions
-+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-+   PARTICULAR PURPOSE. You are solely responsible for determining the
-+   appropriateness of using or redistributing the Work and assume any
-+   risks associated with Your exercise of permissions under this License.
-+
-+8. Limitation of Liability. In no event and under no legal theory,
-+   whether in tort (including negligence), contract, or otherwise,
-+   unless required by applicable law (such as deliberate and grossly
-+   negligent acts) or agreed to in writing, shall any Contributor be
-+   liable to You for damages, including any direct, indirect, special,
-+   incidental, or consequential damages of any character arising as a
-+   result of this License or out of the use or inability to use the
-+   Work (including but not limited to damages for loss of goodwill,
-+   work stoppage, computer failure or malfunction, or any and all
-+   other commercial damages or losses), even if such Contributor
-+   has been advised of the possibility of such damages.
-+
-+9. Accepting Warranty or Additional Liability. While redistributing
-+   the Work or Derivative Works thereof, You may choose to offer,
-+   and charge a fee for, acceptance of support, warranty, indemnity,
-+   or other liability obligations and/or rights consistent with this
-+   License. However, in accepting such obligations, You may act only
-+   on Your own behalf and on Your sole responsibility, not on behalf
-+   of any other Contributor, and only if You agree to indemnify,
-+   defend, and hold each Contributor harmless for any liability
-+   incurred by, or claims asserted against, such Contributor by reason
-+   of your accepting any such warranty or additional liability.
-+
-+END OF TERMS AND CONDITIONS
-+
-+APPENDIX: How to apply the Apache License to your work.
-+
-+   To apply the Apache License to your work, attach the following
-+   boilerplate notice, with the fields enclosed by brackets "[]"
-+   replaced with your own identifying information. (Don't include
-+   the brackets!)  The text should be enclosed in the appropriate
-+   comment syntax for the file format. We also recommend that a
-+   file or class name and description of purpose be included on the
-+   same "printed page" as the copyright notice for easier
-+   identification within third-party archives.
-+
-+Copyright [yyyy] [name of copyright owner]
-+
-+Licensed under the Apache License, Version 2.0 (the "License");
-+you may not use this file except in compliance with the License.
-+You may obtain a copy of the License at
-+
-+    http://www.apache.org/licenses/LICENSE-2.0
-+
-+Unless required by applicable law or agreed to in writing, software
-+distributed under the License is distributed on an "AS IS" BASIS,
-+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-+See the License for the specific language governing permissions and
-+limitations under the License.

config/patches/ohai/license/add-notice-file.patch

@@ -1,38 +0,0 @@
-diff --git a/NOTICE b/NOTICE
-new file mode 100644
-index 000000000..bcf625dc7
---- /dev/null
-+++ b/NOTICE
-@@ -0,0 +1,32 @@
-+============
-+Ohai Notices
-+============
-+
-+Developed at Chef (http://www.chef.io).
-+
-+Contributors and Copyright holders:
-+
-+ * Copyright 2008-2015, Chef <legal@chef.io>
-+ * Copyright 2008-2015, Adam Jacob <adam@chef.io>
-+ * Copyright 2008-2009, Ben Black <nostromo@gmail.com>
-+ * Copyright 2008-2009, Ezra Zygmuntowicz <ezra@engineyard.com>
-+ * Copyright 2009, Joe Williams <joe@joetify.com>
-+ * Copyright 2009, Paul Nasrat <pnasrat@googlemail.com>
-+
-+Parts of Ohai were taken from Chef, a configuration management system.
-+
-+Ohai incorporates functionality from Open4 (http://www.codeforpeople.com/lib/ruby/open4/).
-+
-+============
-+Chef Notices
-+============
-+
-+Developed at Chef (http://www.chef.io).
-+
-+Contributors and Copyright holders:
-+
-+ * Copyright 2008-2015, Adam Jacob <adam@chef.io>
-+ * Copyright 2008, Arjuna Christensen <aj@hjksolutions.com>
-+ * Copyright 2008-2015, Bryan McLellan <btm@loftninjas.org>
-+ * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com>
-+

config/patches/redis-exporter/go-1-21.patch

@@ -1,12 +0,0 @@
-diff --git a/go.mod b/go.mod
-index 70613c0..c3288ff 100644
---- a/go.mod
-+++ b/go.mod
-@@ -1,6 +1,6 @@
- module github.com/oliver006/redis_exporter
- 
--go 1.22
-+go 1.21
- 
- require (
- 	github.com/gomodule/redigo v1.8.9

config/patches/tomlib/license/add-license-file.patch

@@ -1,27 +0,0 @@
-diff --git a/LICENSE.txt b/LICENSE.txt
-new file mode 100644
-index 000000000..82cf5177b
---- /dev/null
-+++ b/LICENSE.txt
-@@ -0,0 +1,21 @@
-+The MIT License (MIT)
-+
-+Copyright (c) 2022 Kamil Giszczak
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+THE SOFTWARE.

config/projects/gitlab.rb

@@ -107,16 +107,11 @@ if Build::Check.use_system_ssl?
 end
 
 dependency 'cacerts'
-dependency 'faraday-cage'
+dependency 'omnibus-gitlab-gems'
 dependency 'gitlab-selinux' if SELinuxDistroHelper.selinux_supported?
 dependency 'redis'
 dependency 'nginx'
-dependency 'mixlib-log'
-dependency 'chef-zero'
-dependency 'ohai'
 dependency 'chef-gem'
-dependency 'chef-bin'
-dependency 'remote-syslog'
 dependency 'logrotate'
 dependency 'runit'
 dependency 'go-crond'

config/software/acme-client.rb

@@ -1,33 +0,0 @@
-#
-# Copyright:: Copyright (c) 2017 GitLab Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name 'acme-client'
-default_version '2.0.17'
-
-license 'MIT'
-license_file 'LICENSE.txt'
-
-skip_transitive_dependency_licensing true
-
-dependency 'ruby'
-dependency 'rubygems'
-
-build do
-  patch source: 'add-license-file.patch'
-
-  env = with_standard_compiler_flags(with_embedded_path)
-  gem "install acme-client --no-document --version #{version}", env: env
-end

config/software/chef-acme.rb

@@ -32,7 +32,7 @@ source git: version.remote
 # Omnibus Build order: https://github.com/chef/omnibus/blob/c872e61c30d2b3f88ead03bd1254ff96d37059a3/lib/omnibus/library.rb#L64
 dependency 'gitlab-cookbooks' unless project.dependencies.include?('gitlab-cookbooks')
 
-dependency 'acme-client'
+dependency 'omnibus-gitlab-gems'
 dependency 'compat_resource'
 
 target_path = "#{install_dir}/embedded/cookbooks/acme"

config/software/chef-bin.rb

@@ -1,63 +0,0 @@
-#
-# Copyright 2020-2022 GitLab Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name 'chef-bin'
-# The version here should be in agreement with the chef-gem version and
-# /Gemfile.lock so that our rspec testing stays consistent with the package
-# contents.
-default_version '18.3.0'
-
-license 'Apache-2.0'
-license_file 'LICENSE'
-
-skip_transitive_dependency_licensing true
-
-dependency 'ruby'
-dependency 'rubygems'
-
-build do
-  env = with_standard_compiler_flags(with_embedded_path)
-  patch source: 'add-license-file.patch'
-
-  # TODO: rubocop-ast installs a later version of parser, which omits the AST::Processor
-  # mixin, causing breakage. This is a temporary workaround until a more permanent fix
-  # is in place: https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7362
-  gem 'install parser' \
-    " --clear-sources" \
-      " -s https://packagecloud.io/cinc-project/stable" \
-      " -s https://rubygems.org" \
-    " --version '3.3.0.5'" \
-      " --bindir '#{install_dir}/embedded/bin'" \
-      ' --no-document', env: env
-
-  # Temporary workaround because upstream inspec-core does not list this as
-  # a requirement and it causes failures during gitlab-ctl reconfigure in
-  # the QA job pipelines
-  gem 'install rubocop-ast' \
-    " --clear-sources" \
-      " -s https://packagecloud.io/cinc-project/stable" \
-      " -s https://rubygems.org" \
-      " --version '1.21.0'" \
-      " --bindir '#{install_dir}/embedded/bin'" \
-      ' --no-document', env: env
-  gem 'install chef-bin' \
-      " --clear-sources" \
-      " -s https://packagecloud.io/cinc-project/stable" \
-      " -s https://rubygems.org" \
-      " --version '#{version}'" \
-      " --bindir '#{install_dir}/embedded/bin'" \
-      ' --no-document', env: env
-end

config/software/chef-gem.rb

@@ -32,21 +32,13 @@ dependency 'ruby'
 dependency 'rubygems'
 dependency 'libffi'
 dependency 'rb-readline'
-dependency 'ruby-shadow'
+dependency 'omnibus-gitlab-gems'
 
 build do
   patch source: "license/add-license-file.patch"
   patch source: "license/add-notice-file.patch"
   env = with_standard_compiler_flags(with_embedded_path)
 
-  gem 'install chef' \
-      " --clear-sources" \
-      " -s https://packagecloud.io/cinc-project/stable" \
-      " -s https://rubygems.org" \
-      " --version '#{version}'" \
-      " --bindir '#{install_dir}/embedded/bin'" \
-      ' --no-document', env: env
-
   block 'patch Chef files' do
     prefix_path = "#{install_dir}/embedded"
     gem_path = shellout!("#{embedded_bin('ruby')} -e \"puts Gem.path.find { |path| path.start_with?(\'#{prefix_path}\') }\"", env: env).stdout.chomp

config/software/chef-zero.rb

@@ -1,47 +0,0 @@
-#
-# Copyright 2016-2022 GitLab Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name 'chef-zero'
-# The version here should be in agreement with /Gemfile.lock so that our rspec
-# testing stays consistent with the package contents.
-default_version '15.0.11'
-
-license 'Apache-2.0'
-license_file 'LICENSE'
-
-skip_transitive_dependency_licensing true
-
-dependency 'ruby'
-# If libarchive is present in system library locations and not bundled with
-# omnibus-gitlab package, then Chef will incorrectly attempt to use it, and can
-# potentially fail as seen from
-# https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/7741. Hence, we need to
-# bundle libarchive in the package.
-dependency 'libarchive'
-dependency 'rubygems'
-
-build do
-  patch source: "license/add-license-file.patch"
-  env = with_standard_compiler_flags(with_embedded_path)
-
-  gem 'install chef-zero' \
-      " --clear-sources" \
-      " -s https://packagecloud.io/cinc-project/stable" \
-      " -s https://rubygems.org" \
-      " --version '#{version}'" \
-      " --bindir '#{install_dir}/embedded/bin'" \
-      ' --no-document', env: env
-end

config/software/exiftool.rb

@@ -15,7 +15,7 @@
 #
 
 name 'exiftool'
-version = Gitlab::Version.new('exiftool', '12.82')
+version = Gitlab::Version.new('exiftool', '12.84')
 default_version version.print(false)
 
 license 'GPL-1.0 or Artistic'

config/software/faraday-cage.rb

@@ -1,54 +0,0 @@
-#
-## Copyright:: Copyright (c) 2021 GitLab Inc.
-## License:: Apache License, Version 2.0
-##
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-#
-
-name 'faraday-cage'
-
-# On this date, we discovered that many, many, many Gemfile and Gemspecs
-# install the latest version of Faraday. This, in turn, installs a version
-# of the net-http gem which causes conflicts that prevent package
-# installation and gitlab-ctl reconfigure.
-default_version '20240109'
-
-license 'MIT'
-license_file 'LICENSE'
-
-skip_transitive_dependency_licensing true
-
-dependency 'ruby'
-
-build do
-  env = with_standard_compiler_flags(with_embedded_path)
-
-  # pin the version of faraday and faraday-net_http temporarily until
-  # conflicts between the version of net-http it requires and the version of
-  # net-http shipped in the Gemfile can be resolved
-  gem 'install faraday-net_http' \
-      " --clear-sources" \
-      " -s https://packagecloud.io/cinc-project/stable" \
-      " -s https://rubygems.org" \
-      " --version '3.0.2'" \
-      " --bindir '#{install_dir}/embedded/bin'" \
-      ' --no-document', env: env
-
-  gem 'install faraday' \
-      " --clear-sources" \
-      " -s https://packagecloud.io/cinc-project/stable" \
-      " -s https://rubygems.org" \
-      " --version '2.8.1'" \
-      " --bindir '#{install_dir}/embedded/bin'" \
-      ' --no-document', env: env
-end

config/software/gitaly.rb

@@ -29,7 +29,7 @@ skip_transitive_dependency_licensing true
 dependency 'pkg-config-lite'
 dependency 'ruby'
 dependency 'libicu'
-dependency 'tomlib'
+dependency 'omnibus-gitlab-gems'
 
 # Technically, gitaly depends on git also. But because of how omnibus arranges
 # components to be built, this causes git to be built early in the process. But

config/software/mixlib-log.rb

@@ -1,40 +0,0 @@
-#
-# Copyright 2016-2022 GitLab Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name 'mixlib-log'
-# The version here should be in agreement with /Gemfile.lock so that our rspec
-# testing stays consistent with the package contents.
-default_version '3.0.9'
-
-license 'Apache-2.0'
-license_file 'LICENSE'
-license_file 'NOTICE'
-
-skip_transitive_dependency_licensing true
-
-dependency 'ruby'
-dependency 'rubygems'
-
-build do
-  patch source: "license/add-license-file.patch"
-  patch source: "license/add-notice-file.patch"
-  env = with_standard_compiler_flags(with_embedded_path)
-
-  gem 'install mixlib-log' \
-      " --version '#{version}'" \
-      " --bindir '#{install_dir}/embedded/bin'" \
-      ' --no-document', env: env
-end

config/software/node-exporter.rb

@@ -18,7 +18,7 @@ require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 require "#{Omnibus::Config.project_root}/lib/gitlab/prometheus_helper"
 
 name 'node-exporter'
-version = Gitlab::Version.new('node-exporter', '1.7.0')
+version = Gitlab::Version.new('node-exporter', '1.8.0')
 default_version version.print
 
 license 'APACHE-2.0'

config/software/ohai.rb

@@ -1,40 +0,0 @@
-#
-# Copyright 2016-2022 GitLab Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name 'ohai'
-# The version here should be in agreement with /Gemfile.lock so that our rspec
-# testing stays consistent with the package contents.
-default_version '18.1.3'
-
-license 'Apache-2.0'
-license_file 'LICENSE'
-license_file 'NOTICE'
-
-skip_transitive_dependency_licensing true
-
-dependency 'ruby'
-dependency 'rubygems'
-
-build do
-  patch source: "license/add-license-file.patch"
-  patch source: "license/add-notice-file.patch"
-  env = with_standard_compiler_flags(with_embedded_path)
-
-  gem 'install ohai' \
-      " --version '#{version}'" \
-      " --bindir '#{install_dir}/embedded/bin'" \
-      ' --no-document', env: env
-end

config/software/omnibus-gitlab-gems.rb

@@ -0,0 +1,55 @@
+#
+## Copyright:: Copyright (c) 2021 GitLab Inc.
+## License:: Apache License, Version 2.0
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+#
+
+name 'omnibus-gitlab-gems'
+
+default_version '20240110'
+
+license 'MIT'
+license_file 'LICENSE'
+
+skip_transitive_dependency_licensing true
+
+dependency 'ruby'
+# If libarchive is present in system library locations and not bundled with
+# omnibus-gitlab package, then Chef will incorrectly attempt to use it, and can
+# potentially fail as seen from
+# https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/7741. Hence, we need to
+# bundle libarchive in the package.
+dependency 'libarchive'
+dependency 'rubygems'
+
+build do
+  gemfile_dir = "#{install_dir}/embedded/service/omnibus-gitlab"
+
+  mkdir gemfile_dir
+  gemfile = File.join(Omnibus::Config.project_root, 'config/templates/omnibus-gitlab-gems/Gemfile')
+  gemfile_lock = "#{gemfile}.lock"
+
+  [gemfile, gemfile_lock].each do |filename|
+    copy filename, gemfile_dir
+  end
+
+  env = with_standard_compiler_flags(with_embedded_path)
+
+  target_gemfile = File.join(gemfile_dir, 'Gemfile')
+  env['BUNDLE_GEMFILE'] = target_gemfile
+  bundle "config set --local frozen 'true'", env: env
+  bundle "install --jobs #{workers} --retry 5", env: env
+  bundle "exec license_finder report --project_path=#{gemfile_dir} --decisions-file=#{Omnibus::Config.project_root}/support/dependency_decisions.yml --format=json --columns name version licenses texts notice --save=license.json", env: env
+  copy "license.json", "#{install_dir}/licenses/omnibus-gitlab-gems.json"
+end

config/software/redis-exporter.rb

@@ -20,7 +20,7 @@ require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 require 'time'
 
 name 'redis-exporter'
-version = Gitlab::Version.new('redis-exporter', '1.58.0')
+version = Gitlab::Version.new('redis-exporter', '1.59.0')
 default_version version.print
 
 license 'MIT'
@@ -31,8 +31,6 @@ source git: version.remote
 relative_path 'src/github.com/oliver006/redis_exporter'
 
 build do
-  patch source: 'go-1-21.patch'
-
   env = {
     'GOPATH' => "#{Omnibus::Config.source_dir}/redis-exporter",
     'GO111MODULE' => 'on',

config/software/registry.rb

@@ -19,7 +19,7 @@
 require "#{Omnibus::Config.project_root}/lib/gitlab/version"
 
 name 'registry'
-version = Gitlab::Version.new('registry', 'v3.93.0-gitlab')
+version = Gitlab::Version.new('registry', 'v4.0.0-gitlab')
 
 default_version version.print(false)
 display_version version.print(false).delete_suffix('-gitlab')

config/software/remote-syslog.rb

@@ -1,34 +0,0 @@
-#
-## Copyright:: Copyright (c) 2014-2022 GitLab B.V.
-## License:: Apache License, Version 2.0
-##
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-#
-
-name 'remote-syslog'
-default_version '1.6.15'
-
-license 'MIT'
-license_file 'LICENSE'
-
-skip_transitive_dependency_licensing true
-
-dependency 'ruby'
-dependency 'rubygems'
-
-build do
-  patch source: "license/#{version}/add-license-file.patch"
-  env = with_standard_compiler_flags(with_embedded_path)
-  gem "install remote_syslog -n #{install_dir}/embedded/bin --no-document -v #{version}", env: env
-end

config/software/ruby-shadow.rb

@@ -1,38 +0,0 @@
-#
-# Copyright 2012-2015 Chef Software, Inc.
-# Copyright 2017-2023 GitLab Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name 'ruby-shadow'
-
-default_version '2.5.1'
-
-license 'Apache-2.0'
-license_file 'LICENSE'
-
-skip_transitive_dependency_licensing true
-
-dependency 'rubygems'
-
-build do
-  env = with_standard_compiler_flags(with_embedded_path)
-
-  gem 'install gitlab-ruby-shadow' \
-      " --clear-sources" \
-      " -s https://rubygems.org" \
-      " --version '#{version}'" \
-      " --bindir '#{install_dir}/embedded/bin'" \
-      ' --no-document', env: env
-end

config/software/rubygems.rb

@@ -23,7 +23,6 @@ license_file 'LICENSE.txt'
 skip_transitive_dependency_licensing true
 
 dependency 'ruby'
-dependency 'faraday-cage'
 
 build do
   patch source: "license/add-license-file.patch"

config/software/tomlib.rb

@@ -1,36 +0,0 @@
-#
-# Copyright 2016-2023 GitLab Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-name 'tomlib'
-
-# The version here should be in agreement with /Gemfile.lock so that our rspec
-# testing stays consistent with the package contents.
-default_version '0.6.0'
-
-license 'MIT'
-license_file 'LICENSE.txt'
-
-skip_transitive_dependency_licensing true
-
-dependency 'ruby'
-
-build do
-  patch source: "license/add-license-file.patch"
-  env = with_standard_compiler_flags(with_embedded_path)
-
-  gem 'install tomlib' \
-      " --version '#{version}'", env: env
-end

config/templates/omnibus-gitlab-gems/Gemfile

@@ -0,0 +1,53 @@
+# THis defines the dependencies needed for Chef and its cookbooks to
+# run. Any dependency needed by `gitlab-ctl reconfigure` should be
+# included here.
+#
+# Note that you must avoid installing a gem from a Git source in this
+# file because Bundler installs gems from source in a different
+# directory than prepackaged gems. Gems installed from source cannot be
+# found with the Ruby interpreter unless `bundle exec` is used.
+source 'https://rubygems.org'
+
+# chef depends on unf_ext. This needs to be listed before Chef
+# since Cinc will look inside the Cinc RubyGems.
+gem 'unf_ext', '0.0.9.1'
+
+# The version here should be in agreement with /Gemfile.lock so that our rspec
+# testing stays consistent with the package contents.
+source 'https://packagecloud.io/cinc-project/stable' do
+  gem 'chef', '18.3.0'
+  gem 'chef-cli', '5.6.1'
+  gem 'chef-bin', '18.3.0'
+  gem 'chef-config', '18.3.0'
+  gem 'chef-zero', '15.0.11'
+  gem 'inspec-core', '6.6.0'
+end
+
+gem 'ohai', '18.1.3'
+# TODO: Include omnibus-ctl in the Gemfile
+# Currently omnibus-ctl is installed via config/software since we build
+# a custom version from the Git source for licensing reasons and for Ruby 3.2 fixes.
+gem 'acme-client', '2.0.17'
+gem 'rainbow', '3.1.1'
+gem 'gitlab-ruby-shadow', '2.5.1', require: 'shadow'
+gem 'tomlib', '0.6.0'
+gem 'mixlib-log', '3.0.9'
+gem 'remote_syslog', '1.6.15'
+
+# pin the version of faraday and faraday-net_http temporarily until
+# conflicts between the version of net-http it requires and the version of
+# net-http shipped in the Gemfile can be resolved
+gem 'faraday-net_http', '3.0.2'
+gem 'faraday', '2.8.1'
+
+# Temporary workaround because upstream inspec-core does not list this as
+# a requirement and it causes failures during gitlab-ctl reconfigure in
+# the QA job pipelines.
+# This can be dropped once https://github.com/inspec/inspec/pull/6925
+# has been merged and released.
+gem 'rubocop-ast', '1.21.0'
+
+# We need to install our own copy of license_finder since the
+# license_finder installed by gitlab-omnibus-builder appears to search
+# the builder gem directory instead of the Omnibus gem directory.
+gem 'license_finder', '7.1.0'

config/templates/omnibus-gitlab-gems/Gemfile.lock

@@ -0,0 +1,414 @@
+GEM
+  remote: https://packagecloud.io/cinc-project/stable/
+  specs:
+    chef (18.3.0)
+      addressable
+      aws-sdk-s3 (~> 1.91)
+      aws-sdk-secretsmanager (~> 1.46)
+      chef-config (= 18.3.0)
+      chef-utils (= 18.3.0)
+      chef-vault
+      chef-zero (>= 14.0.11)
+      corefoundation (~> 0.3.4)
+      diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0)
+      erubis (~> 2.7)
+      ffi (>= 1.15.5)
+      ffi-libarchive (~> 1.0, >= 1.0.3)
+      ffi-yajl (~> 2.2)
+      iniparse (~> 1.4)
+      inspec-core (>= 5)
+      license-acceptance (>= 1.0.5, < 3)
+      mixlib-archive (>= 0.4, < 2.0)
+      mixlib-authentication (>= 2.1, < 4)
+      mixlib-cli (>= 2.1.1, < 3.0)
+      mixlib-log (>= 2.0.3, < 4.0)
+      mixlib-shellout (>= 3.1.1, < 4.0)
+      net-ftp
+      net-sftp (>= 2.1.2, < 5.0)
+      ohai (~> 18.0)
+      plist (~> 3.2)
+      proxifier2 (~> 1.1)
+      syslog-logger (~> 1.6)
+      train-core (~> 3.10)
+      train-rest (>= 0.4.1)
+      train-winrm (>= 0.2.5)
+      unf_ext (>= 0.0.8.2)
+      uuidtools (>= 2.1.5, < 3.0)
+      vault (~> 0.16)
+    chef-bin (18.3.0)
+      chef (= 18.3.0)
+    chef-cli (5.6.1)
+      addressable (>= 2.3.5, < 2.9)
+      chef (>= 16.0)
+      cookbook-omnifetch (~> 0.5)
+      diff-lcs (>= 1.0, < 1.4)
+      ffi-yajl (>= 1.0, < 3.0)
+      license-acceptance (>= 1.0.11, < 3)
+      minitar (~> 0.6)
+      mixlib-cli (>= 1.7, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      pastel (~> 0.7)
+      solve (> 2.0, < 5.0)
+    chef-config (18.3.0)
+      addressable
+      chef-utils (= 18.3.0)
+      fuzzyurl
+      mixlib-config (>= 2.2.12, < 4.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      tomlrb (~> 1.2)
+    chef-utils (18.3.0)
+      concurrent-ruby
+    chef-zero (15.0.11)
+      ffi-yajl (~> 2.2)
+      hashie (>= 2.0, < 5.0)
+      mixlib-log (>= 2.0, < 4.0)
+      rack (~> 2.0, >= 2.0.6)
+      uuidtools (~> 2.1)
+      webrick
+    inspec-core (6.6.0)
+      addressable (~> 2.4)
+      chef-licensing (>= 0.7.5)
+      chef-telemetry (~> 1.0, >= 1.0.8)
+      faraday (>= 1, < 3)
+      faraday-follow_redirects (~> 0.3)
+      hashie (>= 3.4, < 6.0)
+      license-acceptance (>= 0.2.13, < 3.0)
+      method_source (>= 0.8, < 2.0)
+      mixlib-log (~> 3.0)
+      multipart-post (~> 2.0)
+      parallel (~> 1.9)
+      parslet (>= 1.5, < 2.0)
+      pry (~> 0.13)
+      rspec (>= 3.9, <= 3.12)
+      rspec-its (~> 1.2)
+      rubyzip (>= 1.2.2, < 3.0)
+      semverse (~> 3.0)
+      sslshake (~> 1.2)
+      thor (>= 0.20, < 1.3.0)
+      tomlrb (>= 1.2, < 2.1)
+      train-core (>= 3.11.0)
+      tty-prompt (~> 0.17)
+      tty-table (~> 0.10)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    acme-client (2.0.17)
+      faraday (>= 1.0, < 3.0.0)
+      faraday-retry (>= 1.0, < 3.0.0)
+    activesupport (7.0.8)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    ast (2.4.2)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.883.0)
+    aws-sdk-core (3.190.3)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.76.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.142.0)
+      aws-sdk-core (~> 3, >= 3.189.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.8)
+    aws-sdk-secretsmanager (1.89.0)
+      aws-sdk-core (~> 3, >= 3.188.0)
+      aws-sigv4 (~> 1.1)
+    aws-sigv4 (1.8.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.2.0)
+    builder (3.2.4)
+    chef-licensing (0.7.5)
+      activesupport (~> 7.0, < 7.1)
+      chef-config (>= 15)
+      faraday (>= 1, < 3)
+      faraday-http-cache
+      tty-prompt (~> 0.23)
+      tty-spinner (~> 0.9.3)
+    chef-telemetry (1.1.1)
+      chef-config
+      concurrent-ruby (~> 1.0)
+    chef-vault (4.1.11)
+    coderay (1.1.3)
+    concurrent-ruby (1.2.3)
+    cookbook-omnifetch (0.12.2)
+      mixlib-archive (>= 0.4, < 2.0)
+    corefoundation (0.3.13)
+      ffi (>= 1.15.0)
+    date (3.3.4)
+    diff-lcs (1.3)
+    domain_name (0.6.20240107)
+    em-resolv-replace (1.1.3)
+    erubi (1.12.0)
+    erubis (2.7.0)
+    eventmachine (1.0.9.1)
+    eventmachine-tail (0.6.5)
+      eventmachine
+    faraday (2.8.1)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-http-cache (2.5.1)
+      faraday (>= 0.8)
+    faraday-net_http (3.0.2)
+    faraday-retry (2.2.1)
+      faraday (~> 2.0)
+    ffi (1.16.3)
+    ffi-libarchive (1.1.13)
+      ffi (~> 1.0)
+    ffi-yajl (2.6.0)
+      libyajl2 (>= 1.2)
+    file-tail (1.2.0)
+      tins (~> 1.0)
+    fuzzyurl (0.9.0)
+    gitlab-ruby-shadow (2.5.1)
+    gssapi (1.3.1)
+      ffi (>= 1.0.1)
+    gyoku (1.4.0)
+      builder (>= 2.1.2)
+      rexml (~> 3.0)
+    hashie (3.6.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    iniparse (1.5.0)
+    ipaddress (0.8.3)
+    jmespath (1.6.2)
+    json (2.7.1)
+    libyajl2 (2.1.0)
+    license-acceptance (2.1.13)
+      pastel (~> 0.7)
+      tomlrb (>= 1.2, < 3.0)
+      tty-box (~> 0.6)
+      tty-prompt (~> 0.20)
+    license_finder (7.1.0)
+      bundler
+      rubyzip (>= 1, < 3)
+      thor (~> 1.2)
+      tomlrb (>= 1.3, < 2.1)
+      with_env (= 1.1.0)
+      xml-simple (~> 1.1.9)
+    little-plugger (1.1.4)
+    logging (2.3.1)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.14)
+    method_source (1.0.0)
+    mime-types (3.5.2)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2023.1205)
+    minitar (0.9)
+    minitest (5.21.2)
+    mixlib-archive (1.1.7)
+      mixlib-log
+    mixlib-authentication (3.0.10)
+    mixlib-cli (2.1.8)
+    mixlib-config (3.0.27)
+      tomlrb
+    mixlib-log (3.0.9)
+    mixlib-shellout (3.2.7)
+      chef-utils
+    molinillo (0.8.0)
+    multi_json (1.15.0)
+    multipart-post (2.3.0)
+    net-ftp (0.3.4)
+      net-protocol
+      time
+    net-protocol (0.2.2)
+      timeout
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-sftp (4.0.0)
+      net-ssh (>= 5.0.0, < 8.0.0)
+    net-ssh (7.2.1)
+    netrc (0.11.0)
+    nori (2.6.0)
+    ohai (18.1.3)
+      chef-config (>= 14.12, < 19)
+      chef-utils (>= 16.0, < 19)
+      ffi (~> 1.9)
+      ffi-yajl (~> 2.2)
+      ipaddress
+      mixlib-cli (>= 1.7.0)
+      mixlib-config (>= 2.0, < 4.0)
+      mixlib-log (>= 2.0.1, < 4.0)
+      mixlib-shellout (~> 3.2, >= 3.2.5)
+      plist (~> 3.1)
+      train-core
+      wmi-lite (~> 1.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
+      ast (~> 2.4.1)
+      racc
+    parslet (1.8.2)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    plist (3.7.1)
+    proxifier2 (1.1.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (5.0.4)
+    racc (1.7.3)
+    rack (2.2.8)
+    rainbow (3.1.1)
+    remote_syslog (1.6.15)
+      em-resolv-replace
+      eventmachine (>= 0.12.10, < 1.1)
+      eventmachine-tail (>= 0.6.4)
+      file-tail
+      servolux (~> 0.10.0)
+      syslog_protocol (~> 0.9.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.12.6)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop-ast (1.21.0)
+      parser (>= 3.1.1.0)
+    ruby2_keywords (0.0.5)
+    rubyntlm (0.6.3)
+    rubyzip (2.3.2)
+    semverse (3.0.2)
+    servolux (0.10.0)
+    solve (4.0.4)
+      molinillo (~> 0.6)
+      semverse (>= 1.1, < 4.0)
+    sslshake (1.3.1)
+    strings (0.2.1)
+      strings-ansi (~> 0.2)
+      unicode-display_width (>= 1.5, < 3.0)
+      unicode_utils (~> 1.4)
+    strings-ansi (0.2.0)
+    sync (0.5.0)
+    syslog-logger (1.6.8)
+    syslog_protocol (0.9.2)
+    thor (1.2.2)
+    time (0.3.0)
+      date
+    timeout (0.4.1)
+    tins (1.32.1)
+      sync
+    tomlib (0.6.0)
+    tomlrb (1.3.0)
+    train-core (3.11.0)
+      addressable (~> 2.5)
+      ffi (!= 1.13.0)
+      json (>= 1.8, < 3.0)
+      mixlib-shellout (>= 2.0, < 4.0)
+      net-scp (>= 1.2, < 5.0)
+      net-ssh (>= 2.9, < 8.0)
+    train-rest (0.5.0)
+      aws-sigv4 (~> 1.5)
+      rest-client (~> 2.1)
+      train-core (~> 3.0)
+    train-winrm (0.2.13)
+      winrm (>= 2.3.6, < 3.0)
+      winrm-elevated (~> 1.2.2)
+      winrm-fs (~> 1.0)
+    tty-box (0.7.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-cursor (~> 0.7)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    tty-table (0.12.0)
+      pastel (~> 0.8)
+      strings (~> 0.2.0)
+      tty-screen (~> 0.8)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unf_ext (0.0.9.1)
+    unicode-display_width (2.5.0)
+    unicode_utils (1.4.0)
+    uuidtools (2.2.0)
+    vault (0.18.2)
+      aws-sigv4
+    webrick (1.8.1)
+    winrm (2.3.6)
+      builder (>= 2.1.2)
+      erubi (~> 1.8)
+      gssapi (~> 1.2)
+      gyoku (~> 1.0)
+      httpclient (~> 2.2, >= 2.2.0.2)
+      logging (>= 1.6.1, < 3.0)
+      nori (~> 2.0)
+      rubyntlm (~> 0.6.0, >= 0.6.3)
+    winrm-elevated (1.2.3)
+      erubi (~> 1.8)
+      winrm (~> 2.0)
+      winrm-fs (~> 1.0)
+    winrm-fs (1.3.5)
+      erubi (~> 1.8)
+      logging (>= 1.6.1, < 3.0)
+      rubyzip (~> 2.0)
+      winrm (~> 2.0)
+    wisper (2.0.1)
+    with_env (1.1.0)
+    wmi-lite (1.0.7)
+    xml-simple (1.1.9)
+      rexml
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  acme-client (= 2.0.17)
+  chef (= 18.3.0)!
+  chef-bin (= 18.3.0)!
+  chef-cli (= 5.6.1)!
+  chef-config (= 18.3.0)!
+  chef-zero (= 15.0.11)!
+  faraday (= 2.8.1)
+  faraday-net_http (= 3.0.2)
+  gitlab-ruby-shadow (= 2.5.1)
+  inspec-core (= 6.6.0)!
+  license_finder (= 7.1.0)
+  mixlib-log (= 3.0.9)
+  ohai (= 18.1.3)
+  rainbow (= 3.1.1)
+  remote_syslog (= 1.6.15)
+  rubocop-ast (= 1.21.0)
+  tomlib (= 0.6.0)
+  unf_ext (= 0.0.9.1)
+
+BUNDLED WITH
+   2.5.5

deps.yml

@@ -29,8 +29,8 @@ dependencies:
       # acme-client
       https://github.com/unixcharles/acme-client.git:
         replace_in_files:
-        - filename: config/software/acme-client.rb
-          pattern: "default_version '(\\S+)'"
+        - filename: config/templates/omnibus-gitlab-gems/Gemfile
+          pattern: "gem 'acme-client', '(\\S+)'"
           tag_prefix: 'v'
       # chef-acme
       https://github.com/schubergphilis/chef-acme.git:
@@ -47,8 +47,8 @@ dependencies:
       # chef
       https://github.com/chef/chef.git:
         replace_in_files:
-        - filename: config/software/chef-gem.rb
-          pattern: "default_version '(\\S+)'"
+        - filename: config/templates/omnibus-gitlab-gems/Gemfile
+          pattern: "gem 'chef', '(\\S+)'"
           tag_prefix: 'v'
           range: '<= 18.x'
         - filename: config/software/chef-bin.rb
@@ -58,8 +58,8 @@ dependencies:
       # ohai
       https://github.com/chef/ohai.git:
         replace_in_files:
-        - filename: config/software/ohai.rb
-          pattern: "default_version '(\\S+)'"
+        - filename: config/templates/omnibus-gitlab-gems/Gemfile
+          pattern: "gem 'ohai', '(\\S+)'"
           tag_prefix: 'v'
           range: '<= 18.x'
       # mixlib-log
@@ -69,9 +69,8 @@ dependencies:
           pattern: "default_version '(\\S+)'"
       # chef-zero
       https://github.com/chef/chef-zero:
-        replace_in_files:
-        - filename: config/software/chef-zero.rb
-          pattern: "default_version '(\\S+)'"
+        - filename: config/templates/omnibus-gitlab-gems/Gemfile
+          pattern: "gem 'chef-zero', '(\\S+)'"
       # compat_resource
       https://github.com/chef-cookbooks/compat_resource.git:
         replace_in_files:
@@ -132,8 +131,8 @@ dependencies:
       # remote-syslog
       https://github.com/papertrail/remote_syslog.git:
         replace_in_files:
-        - filename: config/software/remote-syslog.rb
-          pattern: "default_version '(\\S+)'"
+        - filename: config/templates/omnibus-gitlab-gems/Gemfile
+          pattern: "gem 'remote_syslog', '(\\S+)'"
       # rubygems
       https://github.com/rubygems/rubygems.git:
         replace_in_files:

doc/architecture/index.md

@@ -148,7 +148,7 @@ parsed correctly.
 
 ### runit
 
-GitLab uses [runit](http://smarden.org/runit/) recipes for
+GitLab uses [runit](https://smarden.org/runit/) recipes for
 service management and supervision. runit recipes do the job of identifying the
 init system used by the OS and performing basic service management tasks like
 creating necessary service files for GitLab, service enabling, and service

doc/architecture/multiple_database_support/index.md

@@ -82,7 +82,7 @@ cluster for all databases_ to _one cluster per database_.
 Therefore the HA configuration of logical databases must be independent of the
 deployment model.
 
-Consul [services](https://developer.hashicorp.com/consul/docs/srvices/configuration/services-configuration-reference)
+Consul [services](https://developer.hashicorp.com/consul/docs/services/configuration/services-configuration-reference)
 can have multiple health-checks and [watches](https://developer.hashicorp.com/consul/docs/dynamic-app-config/watches#service).
 At this level, Omnibus GitLab defines _a Consul service per database cluster_
 and _a service watch per logical database_.

doc/development/upgrading-chef.md

@@ -17,14 +17,14 @@ to upgrade to the latest version and verify the functionality.
    git switch -c upgrade-chef-to-X
    ```
 
-1. Update the appropriate software entries in `config/software/`. Change `default_version` to be the newer version we're upgrading to for:
+1. Update the appropriate software entries in `config/templates/omnibus-gitlab-gems/Gemfile`.
+1. In the `config/templates/omnibus-gitlab-gems` directory, run `bundle update` for the updated gems:
 
-    1. chef-bin
-    1. chef-gem
-    1. chef-zero
-    1. ohai
+   ```shell
+   bundle update chef ohai
+   ```
 
-1. Update entries in `Gemfile` to the new version. At a mininum, the `chef` and `ohai` entries will need to be updated.
+1. Update entries in `Gemfile` to the new version. At a minimum, the `chef` and `ohai` entries will need to be updated.
 1. Update the bundle
 
    1. If this is a major version upgrade
@@ -44,7 +44,7 @@ to upgrade to the latest version and verify the functionality.
 1. Commit the changes
 
    ```shell
-   git add config/software/chef-{bin,gem,zero}.rb
+   git add config/templates/omnibus-gitlab-gems/Gemfile{,.lock}
    git add Gemfile{,.lock}
    git commit
    git push

doc/settings/logs.md

@@ -77,7 +77,7 @@ The [runit-managed](../architecture/index.md#runit) services in Linux package in
   GitLab last wrote to that file.
 - `zmore` and `zgrep` allow viewing and searching through both compressed or uncompressed logs.
 
-Read the [svlogd documentation](https://smarden.org/runit/svlogd.8.html) for more information
+Read the [svlogd documentation](https://smarden.org/runit/svlogd.8) for more information
 about the files it generates.
 
 You can modify svlogd settings via `/etc/gitlab/gitlab.rb` with the following settings:

doc/settings/memory_constrained_envs.md

@@ -145,14 +145,14 @@ We observed 100-400MB of memory usage reduction configuring Puma this way.
 ## Optimize Sidekiq
 
 Sidekiq is a background processing daemon. When configured with GitLab by default
-it runs with a high concurrency mode of `50`. This does impact how much memory it can
+it runs with a concurrency mode of `20`. This does impact how much memory it can
 allocate at a given time. It is advised to configure it to use a significantly
 smaller value of `5` or `10` (preferred).
 
 In `/etc/gitlab/gitlab.rb`:
 
 ```ruby
-sidekiq['max_concurrency'] = 10
+sidekiq['concurrency'] = 10
 ```
 
 ## Optimize Gitaly
@@ -249,7 +249,7 @@ and disable the Prometheus Metrics feature:
    ```ruby
    puma['worker_processes'] = 0
 
-   sidekiq['max_concurrency'] = 10
+   sidekiq['concurrency'] = 10
 
    prometheus_monitoring['enable'] = false
 

doc/settings/redis.md

@@ -120,7 +120,7 @@ redis['announce_ip_from_hostname'] = true
 ## Setting the Redis Cache instance as an LRU
 
 Using multiple Redis instances allows you to configure Redis as a
-[Least Recently Used cache](https://redis.io/docs/manual/eviction/). Note you should only
+[Least Recently Used cache](https://redis.io/docs/latest/operate/rs/databases/memory-performance/eviction-policy/). Note you should only
 do this for the Redis cache, rate-limiting, and repository cache instances; the Redis queues, shared
 state instances, and tracechunks instances should never be configured as an LRU,
 since they contain data (e.g. Sidekiq jobs) that is expected to be persistent.
@@ -160,7 +160,7 @@ You can configure Redis to run behind SSL.
 NOTE:
 Some `redis-cli` binaries are not built with support for directly connecting to a Redis server over TLS.
 If your `redis-cli` doesn't support the `--tls` flag, you will have to use something like
-[`stunnel`](https://redis.com/blog/stunnel-secure-redis-ssl/) to connect to the
+[`stunnel`](https://redis.io/blog/stunnel-secure-redis-ssl/) to connect to the
 Redis server using `redis-cli` for any debugging purposes.
 
 ### Make GitLab client connect to Redis server over SSL

doc/settings/rpi.md

@@ -55,7 +55,7 @@ some running processes:
    ```ruby
    # Reduce the number of running workers to the minimum in order to reduce memory usage
    puma['worker_processes'] = 2
-   sidekiq['max_concurrency'] = 9
+   sidekiq['concurrency'] = 9
    # Turn off monitoring to reduce idle cpu and disk usage
    prometheus_monitoring['enable'] = false
    ```

doc/settings/smtp.md

@@ -142,7 +142,7 @@ gitlab_rails['smtp_force_ssl'] = false
 NOTE:
 Gmail has [strict sending limits](https://support.google.com/a/answer/166852)
 that can impair functionality as your organization grows. We strongly recommend using a
-transactional service like [SendGrid](https://sendgrid.com/) or [Mailgun](https://www.mailgun.com/)
+transactional service like [SendGrid](https://sendgrid.com/en-us) or [Mailgun](https://www.mailgun.com/)
 for teams using SMTP configuration.
 
 ```ruby
@@ -1216,7 +1216,7 @@ gitlab_rails['gitlab_email_from'] = 'username@example.com'
 gitlab_rails['gitlab_email_reply_to'] = 'username@example.com'
 ```
 
-Check the SMTP user name and SMTP user password from the ESS [dashboard](https://pfs.nifcloud.com/help/ess/dashboard.htm).
+Check the SMTP user name and SMTP user password from the ESS [dashboard](https://docs.nifcloud.com/ess/help/dashboard.htm).
 `gitlab_email_from` and `gitlab_email_reply_to` must be ESS authenticated sender email addresses.
 
 ### Sina mail

files/gitlab-config-template/gitlab.rb.template

@@ -1280,9 +1280,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # sidekiq['log_format'] = "json"
 # sidekiq['shutdown_timeout'] = 4
 # sidekiq['interval'] = nil
-# sidekiq['concurrency'] = nil
-# sidekiq['max_concurrency'] = 20
-# sidekiq['min_concurrency'] = nil
+# sidekiq['concurrency'] = 20
 
 ##! GitLab allows route a job to a particular queue determined by an array of ##! routing rules.
 ##! Each routing rule is a tuple of queue selector query and corresponding queue. By default,

files/gitlab-cookbooks/gitlab/attributes/default.rb

@@ -728,9 +728,7 @@ default['gitlab']['sidekiq']['health_checks_listen_port'] = 8092
 
 # Cluster specific settings
 default['gitlab']['sidekiq']['interval'] = nil
-default['gitlab']['sidekiq']['concurrency'] = nil
-default['gitlab']['sidekiq']['max_concurrency'] = 20
-default['gitlab']['sidekiq']['min_concurrency'] = nil
+default['gitlab']['sidekiq']['concurrency'] = 20
 default['gitlab']['sidekiq']['queue_groups'] = ['*']
 default['gitlab']['sidekiq']['consul_service_name'] = 'sidekiq'
 default['gitlab']['sidekiq']['consul_service_meta'] = nil

files/gitlab-cookbooks/gitlab/templates/default/sv-sidekiq-run.erb

@@ -22,12 +22,6 @@ exec chpst -e /opt/gitlab/etc/gitlab-rails/env -P \
       <% if node['gitlab']['sidekiq']['concurrency'] %>
       -c <%= node['gitlab']['sidekiq']['concurrency'] %> \
       <% end %>
-      <% if node['gitlab']['sidekiq']['max_concurrency'] %>
-      -m <%= node['gitlab']['sidekiq']['max_concurrency'] %> \
-      <% end %>
-      <% if node['gitlab']['sidekiq']['min_concurrency'] %>
-      --min-concurrency <%= node['gitlab']['sidekiq']['min_concurrency'] %> \
-      <% end %>
       <% if node['gitlab']['sidekiq']['shutdown_timeout'] %>
       --timeout <%= node['gitlab']['sidekiq']['shutdown_timeout'] %> \
       <% end %>

files/gitlab-cookbooks/package/libraries/deprecations.rb

@@ -346,14 +346,14 @@ module Gitlab
           },
           {
             config_keys: %w(gitlab sidekiq min_concurrency),
-            deprecation: '16.9',
-            removal: '17.0',
+            deprecation: '16.9', # Remove message issue: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8491
+            removal: '17.0', # Removal issue: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/3422
             note: "Starting with GitLab 17.0, `sidekiq['min_concurrency']` will be removed. Please follow https://docs.gitlab.com/ee/administration/sidekiq/extra_sidekiq_processes.html#manage-thread-counts-explicitly to use `sidekiq['concurrency']` instead."
           },
           {
             config_keys: %w(gitlab sidekiq max_concurrency),
-            deprecation: '16.9',
-            removal: '17.0',
+            deprecation: '16.9', # Remove message issue: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/8491
+            removal: '17.0', # Removal issue: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/3422
             note: "Starting with GitLab 17.0, `sidekiq['max_concurrency']` will be removed. Please follow https://docs.gitlab.com/ee/administration/sidekiq/extra_sidekiq_processes.html#manage-thread-counts-explicitly to use `sidekiq['concurrency']` instead."
           },
           {

lib/gitlab/license/analyzer.rb

@@ -27,6 +27,8 @@ module License
       'domelementtype',     # BSD-2-Clause Licensed - https://github.com/fb55/domelementtype/blob/master/LICENSE
       'domhandler',         # BSD-2-Clause Licensed - https://github.com/fb55/domhandler/blob/master/LICENSE
       'domutils',           # BSD-2-Clause Licensed - https://github.com/fb55/domutils/blob/master/LICENSE
+      "eventmachine-tail",  # BSD-3-Clause Licensed - https://code.google.com/archive/p/semicomplete
+      'inspec-core',        # Apache Licensed (gem published from Cinc): https://github.com/inspec/inspec/blob/v6.6.0/LICENSE
       'net-protocol',       # BSD-2-Clause Licensed - https://github.com/ruby/net-protocol/blob/master/LICENSE.txt
       'fsevents',           # MIT Licensed - https://github.com/strongloop/fsevents/blob/master/LICENSE
       'indexof',            # MIT Licensed - https://github.com/component/indexof/blob/master/LICENSE
@@ -36,6 +38,7 @@ module License
       'github.com/cloudflare/tableflip', # BSD-3-Clause Licensed - https://github.com/cloudflare/tableflip/blob/master/LICENSE
       'gitlab.com/gitlab-org/golang-archive-zip', # BSD-3-Clause Licensed - https://gitlab.com/gitlab-org/golang-archive-zip/-/blob/c8e752e2d582090de40338553ef00ef08b89c905/LICENSE
       'spam-classifier', # GitLab project and we can distribute the obfuscated binaries
+      'syslog_protocol', # MIT Licensed - https://github.com/eric/syslog_protocol?tab=readme-ov-file#todo
       'elkjs',           # EPL 2.0 - https://github.com/kieler/elkjs/blob/master/LICENSE.md
     ]
     # readline is GPL licensed and its use was not mere aggregation. Hence it is

spec/chef/cookbooks/gitlab/recipes/sidekiq_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe 'gitlab::sidekiq' do
           expect(content).to match(/rubyopt=\"-W:no-experimental\"/)
           expect(content).to include(%(RUBYOPT="${rubyopt}"))
           expect(content).to match(%r{bin/sidekiq-cluster})
-          expect(content).to match(/-m 20/) # max_concurrency
+          expect(content).to match(/-c 20/) # concurrency
           expect(content).to match(/--timeout 25/) # shutdown timeout
           expect(content).to match(/\*/) # all queues
         }
@@ -64,11 +64,19 @@ RSpec.describe 'gitlab::sidekiq' do
       before do
         stub_gitlab_rb(
           sidekiq: {
-            log_group: 'fugee'
+            log_group: 'fugee',
+            concurrency: 42
           }
         )
       end
       it_behaves_like 'enabled logged service', 'sidekiq', true, { log_directory_owner: 'git', log_group: 'fugee' }
+
+      it 'correctly renders out the sidekiq service file' do
+        expect(chef_run).to render_file("/opt/gitlab/sv/sidekiq/run")
+          .with_content { |content|
+            expect(content).to match(/-c 42/) # concurrency
+          }
+      end
     end
   end