.gitlab-ci.yml

@@ -42,7 +42,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: "4.9.1"
+  BUILDER_IMAGE_REVISION: "4.10.0"
   # The registry to pull the assets image from
   ASSET_REGISTRY: "${CI_REGISTRY}"
   ASSET_SYNC_EXISTING_REMOTE_FILES: "keep"
@@ -90,6 +90,12 @@ variables:
       - gems
     policy: pull
 
+.gems-cache-os-dependent:
+  cache:
+    key: "gems-cache-${CI_JOB_IMAGE}${CACHE_KEY_SUFFIX}"
+    paths:
+      - gems
+
 before_script:
   - echo "PIPELINE_TYPE detected as ${PIPELINE_TYPE}"
   # Exit early if building on an OS for which we don't provide the specified

CHANGELOG.md

@@ -3,6 +3,12 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
 
+## 15.10.3 (2023-04-14)
+
+### Fixed (1 change)
+
+- [Fix suggested_reviewers run when rails is disabled](gitlab-org/omnibus-gitlab@0f8811ebd44b29cc03c1d9b29839011f782172e3) ([merge request](gitlab-org/omnibus-gitlab!6794))
+
 ## 15.10.2 (2023-04-05)
 
 No changes.

config/software/chef-zero.rb

@@ -25,6 +25,12 @@ 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'
 
 build do
   patch source: "license/add-license-file.patch"

config/software/libarchive.rb

+#
+# Copyright:: Copyright (c) 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 'libarchive'
+default_version '3.6.2'
+
+license 'BSD-2-Clause'
+license_file 'COPYING'
+
+skip_transitive_dependency_licensing true
+
+source url: "https://www.libarchive.org/downloads/libarchive-#{version}.tar.gz",
+       sha256: 'ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3'
+
+relative_path "libarchive-#{version}"
+
+build do
+  env = with_standard_compiler_flags(with_embedded_path)
+
+  # 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. But, we don't need support for any of
+  # the possible extensions as we are not using it's functionality at all. So,
+  # when it comes to these extensions, YAGNI. Hence disabling all that can be
+  # disabled.
+  disable_flags = [
+    '--without-zlib',
+    '--without-bz2lib',
+    '--without-libb2',
+    '--without-iconv',
+    '--without-lz4',
+    '--without-zstd',
+    '--without-lzma',
+    '--without-cng',
+    '--without-openssl',
+    '--without-xml2',
+    '--without-expat',
+    '--without-lzo2',
+    '--without-mbedtls',
+    '--without-nettle',
+    '--disable-posix-regex-lib',
+    '--disable-xattr',
+    '--disable-acl',
+    '--disable-bsdtar',
+    '--disable-bsdcat',
+    '--disable-bsdcpio',
+  ]
+
+  configure disable_flags.join(' '), env: env
+
+  make "-j #{workers}", env: env
+  make 'install', env: env
+end

config/software/registry.rb

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

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

@@ -79,80 +79,80 @@ default['gitlab']['geo_secondary']['db_database_tasks'] = true
 # Geo: PostgreSQL (Tracking database)
 ###
 
-default['gitlab']['geo-postgresql'] = default['postgresql'].dup
+default['gitlab']['geo_postgresql'] = default['postgresql'].dup
 # We are inheriting default attributes from postgresql and changing below what should be different
-default['gitlab']['geo-postgresql']['enable'] = false
-default['gitlab']['geo-postgresql']['dir'] = '/var/opt/gitlab/geo-postgresql'
-default['gitlab']['geo-postgresql']['log_directory'] = '/var/log/gitlab/geo-postgresql'
-default['gitlab']['geo-postgresql']['unix_socket_directory'] = nil
-default['gitlab']['geo-postgresql']['ssl'] = 'off'
+default['gitlab']['geo_postgresql']['enable'] = false
+default['gitlab']['geo_postgresql']['dir'] = '/var/opt/gitlab/geo-postgresql'
+default['gitlab']['geo_postgresql']['log_directory'] = '/var/log/gitlab/geo-postgresql'
+default['gitlab']['geo_postgresql']['unix_socket_directory'] = nil
+default['gitlab']['geo_postgresql']['ssl'] = 'off'
 # Postgres User's Environment Path
-default['gitlab']['geo-postgresql']['sql_user'] = 'gitlab_geo'
-default['gitlab']['geo-postgresql']['sql_mattermost_user'] = nil
-default['gitlab']['geo-postgresql']['port'] = 5431
+default['gitlab']['geo_postgresql']['sql_user'] = 'gitlab_geo'
+default['gitlab']['geo_postgresql']['sql_mattermost_user'] = nil
+default['gitlab']['geo_postgresql']['port'] = 5431
 
 # Mininum of 1/8 of total memory and Maximum of 1024MB as sane defaults
-default['gitlab']['geo-postgresql']['shared_buffers'] = "#{[(node['memory']['total'].to_i / 8) / 1024, 1024].max}MB"
+default['gitlab']['geo_postgresql']['shared_buffers'] = "#{[(node['memory']['total'].to_i / 8) / 1024, 1024].max}MB"
 
-default['gitlab']['geo-postgresql']['work_mem'] = '16MB'
-default['gitlab']['geo-postgresql']['maintenance_work_mem'] = '16MB'
-default['gitlab']['geo-postgresql']['effective_cache_size'] = "#{[(node['memory']['total'].to_i / 8) / 1024, 2048].max}MB" # double of shared_buffers estimation
-default['gitlab']['geo-postgresql']['log_min_duration_statement'] = -1 # Disable slow query logging by default
-default['gitlab']['geo-postgresql']['min_wal_size'] = '80MB'
-default['gitlab']['geo-postgresql']['max_wal_size'] = '1GB'
-default['gitlab']['geo-postgresql']['checkpoint_timeout'] = '5min'
-default['gitlab']['geo-postgresql']['checkpoint_completion_target'] = 0.9
-default['gitlab']['geo-postgresql']['checkpoint_warning'] = '30s'
-default['gitlab']['geo-postgresql']['wal_buffers'] = '-1'
-default['gitlab']['geo-postgresql']['autovacuum'] = 'on'
-default['gitlab']['geo-postgresql']['log_autovacuum_min_duration'] = '-1'
-default['gitlab']['geo-postgresql']['autovacuum_max_workers'] = '3'
-default['gitlab']['geo-postgresql']['autovacuum_naptime'] = '1min'
-default['gitlab']['geo-postgresql']['autovacuum_vacuum_threshold'] = '50'
-default['gitlab']['geo-postgresql']['autovacuum_analyze_threshold'] = '50'
-default['gitlab']['geo-postgresql']['autovacuum_vacuum_scale_factor'] = '0.02' # 10x lower than PG defaults
-default['gitlab']['geo-postgresql']['autovacuum_analyze_scale_factor'] = '0.01' # 10x lower than PG defaults
-default['gitlab']['geo-postgresql']['autovacuum_freeze_max_age'] = '200000000'
-default['gitlab']['geo-postgresql']['autovacuum_vacuum_cost_delay'] = '20ms'
-default['gitlab']['geo-postgresql']['autovacuum_vacuum_cost_limit'] = '-1'
-default['gitlab']['geo-postgresql']['statement_timeout'] = '60000'
-default['gitlab']['geo-postgresql']['idle_in_transaction_session_timeout'] = '60000'
-default['gitlab']['geo-postgresql']['log_line_prefix'] = nil
-default['gitlab']['geo-postgresql']['track_activity_query_size'] = '1024'
-default['gitlab']['geo-postgresql']['effective_io_concurrency'] = 1
-default['gitlab']['geo-postgresql']['max_worker_processes'] = 8
-default['gitlab']['geo-postgresql']['max_parallel_workers_per_gather'] = 0
-default['gitlab']['geo-postgresql']['log_lock_waits'] = 1
-default['gitlab']['geo-postgresql']['deadlock_timeout'] = '5s'
-default['gitlab']['geo-postgresql']['track_io_timing'] = 'off'
-default['gitlab']['geo-postgresql']['custom_pg_hba_entries'] = {}
-default['gitlab']['geo-postgresql']['default_statistics_target'] = 1000
+default['gitlab']['geo_postgresql']['work_mem'] = '16MB'
+default['gitlab']['geo_postgresql']['maintenance_work_mem'] = '16MB'
+default['gitlab']['geo_postgresql']['effective_cache_size'] = "#{[(node['memory']['total'].to_i / 8) / 1024, 2048].max}MB" # double of shared_buffers estimation
+default['gitlab']['geo_postgresql']['log_min_duration_statement'] = -1 # Disable slow query logging by default
+default['gitlab']['geo_postgresql']['min_wal_size'] = '80MB'
+default['gitlab']['geo_postgresql']['max_wal_size'] = '1GB'
+default['gitlab']['geo_postgresql']['checkpoint_timeout'] = '5min'
+default['gitlab']['geo_postgresql']['checkpoint_completion_target'] = 0.9
+default['gitlab']['geo_postgresql']['checkpoint_warning'] = '30s'
+default['gitlab']['geo_postgresql']['wal_buffers'] = '-1'
+default['gitlab']['geo_postgresql']['autovacuum'] = 'on'
+default['gitlab']['geo_postgresql']['log_autovacuum_min_duration'] = '-1'
+default['gitlab']['geo_postgresql']['autovacuum_max_workers'] = '3'
+default['gitlab']['geo_postgresql']['autovacuum_naptime'] = '1min'
+default['gitlab']['geo_postgresql']['autovacuum_vacuum_threshold'] = '50'
+default['gitlab']['geo_postgresql']['autovacuum_analyze_threshold'] = '50'
+default['gitlab']['geo_postgresql']['autovacuum_vacuum_scale_factor'] = '0.02' # 10x lower than PG defaults
+default['gitlab']['geo_postgresql']['autovacuum_analyze_scale_factor'] = '0.01' # 10x lower than PG defaults
+default['gitlab']['geo_postgresql']['autovacuum_freeze_max_age'] = '200000000'
+default['gitlab']['geo_postgresql']['autovacuum_vacuum_cost_delay'] = '20ms'
+default['gitlab']['geo_postgresql']['autovacuum_vacuum_cost_limit'] = '-1'
+default['gitlab']['geo_postgresql']['statement_timeout'] = '60000'
+default['gitlab']['geo_postgresql']['idle_in_transaction_session_timeout'] = '60000'
+default['gitlab']['geo_postgresql']['log_line_prefix'] = nil
+default['gitlab']['geo_postgresql']['track_activity_query_size'] = '1024'
+default['gitlab']['geo_postgresql']['effective_io_concurrency'] = 1
+default['gitlab']['geo_postgresql']['max_worker_processes'] = 8
+default['gitlab']['geo_postgresql']['max_parallel_workers_per_gather'] = 0
+default['gitlab']['geo_postgresql']['log_lock_waits'] = 1
+default['gitlab']['geo_postgresql']['deadlock_timeout'] = '5s'
+default['gitlab']['geo_postgresql']['track_io_timing'] = 'off'
+default['gitlab']['geo_postgresql']['custom_pg_hba_entries'] = {}
+default['gitlab']['geo_postgresql']['default_statistics_target'] = 1000
 
 # Replication settings
-default['gitlab']['geo-postgresql']['wal_level'] = 'minimal'
-default['gitlab']['geo-postgresql']['wal_log_hints'] = 'off'
-default['gitlab']['geo-postgresql']['max_wal_senders'] = 0
-default['gitlab']['geo-postgresql']['wal_keep_segments'] = 10
-default['gitlab']['geo-postgresql']['wal_keep_size'] = nil
-default['gitlab']['geo-postgresql']['hot_standby'] = 'off'
-default['gitlab']['geo-postgresql']['max_standby_archive_delay'] = '30s'
-default['gitlab']['geo-postgresql']['max_standby_streaming_delay'] = '30s'
-default['gitlab']['geo-postgresql']['max_replication_slots'] = 0
-default['gitlab']['geo-postgresql']['synchronous_commit'] = 'on'
-default['gitlab']['geo-postgresql']['synchronous_standby_names'] = ''
-default['gitlab']['geo-postgresql']['hot_standby_feedback'] = 'off'
+default['gitlab']['geo_postgresql']['wal_level'] = 'minimal'
+default['gitlab']['geo_postgresql']['wal_log_hints'] = 'off'
+default['gitlab']['geo_postgresql']['max_wal_senders'] = 0
+default['gitlab']['geo_postgresql']['wal_keep_segments'] = 10
+default['gitlab']['geo_postgresql']['wal_keep_size'] = nil
+default['gitlab']['geo_postgresql']['hot_standby'] = 'off'
+default['gitlab']['geo_postgresql']['max_standby_archive_delay'] = '30s'
+default['gitlab']['geo_postgresql']['max_standby_streaming_delay'] = '30s'
+default['gitlab']['geo_postgresql']['max_replication_slots'] = 0
+default['gitlab']['geo_postgresql']['synchronous_commit'] = 'on'
+default['gitlab']['geo_postgresql']['synchronous_standby_names'] = ''
+default['gitlab']['geo_postgresql']['hot_standby_feedback'] = 'off'
 
 # Backup/Archive settings
-default['gitlab']['geo-postgresql']['archive_mode'] = 'off'
-default['gitlab']['geo-postgresql']['archive_command'] = nil
-default['gitlab']['geo-postgresql']['archive_timeout'] = '0'
+default['gitlab']['geo_postgresql']['archive_mode'] = 'off'
+default['gitlab']['geo_postgresql']['archive_command'] = nil
+default['gitlab']['geo_postgresql']['archive_timeout'] = '0'
 
 # pgbouncer settings
-default['gitlab']['geo-postgresql']['pgbouncer_user'] = 'pgbouncer'
-default['gitlab']['geo-postgresql']['pgbouncer_user_password'] = nil
+default['gitlab']['geo_postgresql']['pgbouncer_user'] = 'pgbouncer'
+default['gitlab']['geo_postgresql']['pgbouncer_user_password'] = nil
 
 # Automatically restart on version changes
-default['gitlab']['geo-postgresql']['auto_restart_on_version_change'] = true
+default['gitlab']['geo_postgresql']['auto_restart_on_version_change'] = true
 
 ###
 # Geo: LogCursor (replication)
@@ -165,3 +165,4 @@ default['gitlab']['geo_logcursor']['env_directory'] = '/opt/gitlab/etc/geo-logcu
 default['gitlab']['suggested-reviewers'] = Gitlab::Deprecations::NodeAttribute.new(proc { node['gitlab']['suggested_reviewers'].to_h }, "node['gitlab']['suggested-reviewers']", "node['gitlab']['suggested_reviewers']")
 default['gitlab']['geo-secondary'] = Gitlab::Deprecations::NodeAttribute.new(proc { node['gitlab']['geo_secondary'].to_h }, "node['gitlab']['geo-secondary']", "node['gitlab']['geo_secondary']")
 default['gitlab']['geo-logcursor'] = Gitlab::Deprecations::NodeAttribute.new(proc { node['gitlab']['geo_logcursor'].to_h }, "node['gitlab']['geo-logcursor']", "node['gitlab']['geo_logcursor']")
+default['gitlab']['geo-postgresql'] = Gitlab::Deprecations::NodeAttribute.new(proc { node['gitlab']['geo_postgresql'].to_h }, "node['gitlab']['geo-postgresql']", "node['gitlab']['geo_postgresql']")

files/gitlab-cookbooks/gitlab-ee/libraries/geo_postgresql.rb

 module GeoPostgresql
   class << self
     def parse_variables
-      postgresql_dir = Gitlab['geo_postgresql']['dir'] || node['gitlab']['geo-postgresql']['dir']
+      postgresql_dir = Gitlab['geo_postgresql']['dir'] || node['gitlab']['geo_postgresql']['dir']
 
       Gitlab['geo_postgresql']['unix_socket_directory'] ||= postgresql_dir
       Gitlab['geo_postgresql']['home'] ||= postgresql_dir
@@ -17,8 +17,8 @@ module GeoPostgresql
 
     def parse_wal_keep_size
       wal_segment_size = 16
-      wal_keep_segments = Gitlab['geo_postgresql']['wal_keep_segments'] || node['gitlab']['geo-postgresql']['wal_keep_segments']
-      wal_keep_size = Gitlab['geo_postgresql']['wal_keep_size'] || node['gitlab']['geo-postgresql']['wal_keep_size']
+      wal_keep_segments = Gitlab['geo_postgresql']['wal_keep_segments'] || node['gitlab']['geo_postgresql']['wal_keep_segments']
+      wal_keep_size = Gitlab['geo_postgresql']['wal_keep_size'] || node['gitlab']['geo_postgresql']['wal_keep_size']
 
       Gitlab['geo_postgresql']['wal_keep_size'] = if wal_keep_size.nil?
                                                     wal_keep_segments.to_i * wal_segment_size

files/gitlab-cookbooks/gitlab-ee/recipes/geo-postgresql.rb

@@ -22,13 +22,13 @@ include_recipe 'postgresql::sysctl'
 account_helper = AccountHelper.new(node)
 omnibus_helper = OmnibusHelper.new(node)
 
-postgresql_log_dir = node['gitlab']['geo-postgresql']['log_directory']
+postgresql_log_dir = node['gitlab']['geo_postgresql']['log_directory']
 postgresql_username = account_helper.postgresql_user
-postgresql_data_dir = File.join(node['gitlab']['geo-postgresql']['dir'], 'data')
+postgresql_data_dir = File.join(node['gitlab']['geo_postgresql']['dir'], 'data')
 
 geo_pg_helper = GeoPgHelper.new(node)
 
-directory node['gitlab']['geo-postgresql']['dir'] do
+directory node['gitlab']['geo_postgresql']['dir'] do
   owner postgresql_username
   mode '0755'
   recursive true
@@ -60,7 +60,7 @@ template postgresql_config do
   owner postgresql_username
   mode '0644'
   helper(:pg_helper) { geo_pg_helper }
-  variables(node['gitlab']['geo-postgresql'].to_hash)
+  variables(node['gitlab']['geo_postgresql'].to_hash)
   cookbook 'postgresql'
   notifies :restart, 'runit_service[geo-postgresql]', :immediately if should_notify
 end
@@ -70,7 +70,7 @@ template postgresql_runtime_config do
   owner postgresql_username
   mode '0644'
   helper(:pg_helper) { geo_pg_helper }
-  variables(node['gitlab']['geo-postgresql'].to_hash)
+  variables(node['gitlab']['geo_postgresql'].to_hash)
   cookbook 'postgresql'
   notifies :run, 'execute[reload geo-postgresql]', :immediately if should_notify
 end
@@ -81,7 +81,7 @@ template pg_hba_config do
   source 'pg_hba.conf.erb'
   owner postgresql_username
   mode '0644'
-  variables(lazy { node['gitlab']['geo-postgresql'].to_hash })
+  variables(lazy { node['gitlab']['geo_postgresql'].to_hash })
   cookbook 'postgresql'
   notifies :restart, 'runit_service[geo-postgresql]', :immediately if should_notify
 end
@@ -89,19 +89,19 @@ end
 template File.join(postgresql_data_dir, 'pg_ident.conf') do
   owner postgresql_username
   mode '0644'
-  variables(node['gitlab']['geo-postgresql'].to_hash)
+  variables(node['gitlab']['geo_postgresql'].to_hash)
   cookbook 'postgresql'
   notifies :restart, 'runit_service[geo-postgresql]', :immediately if should_notify
 end
 
 runit_service 'geo-postgresql' do
-  start_down node['gitlab']['geo-postgresql']['ha']
+  start_down node['gitlab']['geo_postgresql']['ha']
   restart_on_update false
   control(['t'])
   options({
     log_directory: postgresql_log_dir
   }.merge(params))
-  log_options node['gitlab']['logging'].to_hash.merge(node['gitlab']['geo-postgresql'].to_hash)
+  log_options node['gitlab']['logging'].to_hash.merge(node['gitlab']['geo_postgresql'].to_hash)
 end
 
 execute 'start geo-postgresql' do
@@ -121,12 +121,12 @@ template '/opt/gitlab/etc/gitlab-geo-psql-rc' do
   group 'root'
 end
 
-geo_pg_port = node['gitlab']['geo-postgresql']['port']
-geo_pg_user = node['gitlab']['geo-postgresql']['sql_user']
-geo_pg_user_password = node['gitlab']['geo-postgresql']['sql_user_password']
+geo_pg_port = node['gitlab']['geo_postgresql']['port']
+geo_pg_user = node['gitlab']['geo_postgresql']['sql_user']
+geo_pg_user_password = node['gitlab']['geo_postgresql']['sql_user_password']
 geo_database_name = node['gitlab']['geo_secondary']['db_database']
 
-if node['gitlab']['geo-postgresql']['enable']
+if node['gitlab']['geo_postgresql']['enable']
   postgresql_user geo_pg_user do
     password "md5#{geo_pg_user_password}" unless geo_pg_user_password.nil?
     helper geo_pg_helper
@@ -136,7 +136,7 @@ if node['gitlab']['geo-postgresql']['enable']
   postgresql_database geo_database_name do
     owner geo_pg_user
     database_port geo_pg_port
-    database_socket node['gitlab']['geo-postgresql']['unix_socket_directory']
+    database_socket node['gitlab']['geo_postgresql']['unix_socket_directory']
     helper geo_pg_helper
     action :create
   end
@@ -148,9 +148,9 @@ if node['gitlab']['geo-postgresql']['enable']
   end
 
   version_file 'Create version file for PostgreSQL' do
-    version_file_path File.join(node['gitlab']['geo-postgresql']['dir'], 'VERSION')
+    version_file_path File.join(node['gitlab']['geo_postgresql']['dir'], 'VERSION')
     version_check_cmd "/opt/gitlab/embedded/bin/postgres --version"
-    notifies :restart, 'runit_service[geo-postgresql]', :immediately if node['gitlab']['geo-postgresql']['auto_restart_on_version_change'] && geo_pg_helper.is_running? && should_notify
+    notifies :restart, 'runit_service[geo-postgresql]', :immediately if node['gitlab']['geo_postgresql']['auto_restart_on_version_change'] && geo_pg_helper.is_running? && should_notify
   end
 
   ruby_block 'warn pending geo-postgresql restart' do
@@ -164,7 +164,7 @@ if node['gitlab']['geo-postgresql']['enable']
       LoggingHelper.warning(message)
     end
     only_if { geo_pg_helper.is_running? && geo_pg_helper.running_version != geo_pg_helper.version }
-    not_if { node['gitlab']['geo-postgresql']['auto_restart_on_version_change'] }
+    not_if { node['gitlab']['geo_postgresql']['auto_restart_on_version_change'] }
   end
 end
 

files/gitlab-cookbooks/gitlab-ee/templates/default/gitlab-geo-psql-rc.erb

 psql_user='<%= node['postgresql']['username'] %>'
 psql_group='<%= node['postgresql']['group'] %>'
-psql_host='<%= node['gitlab']['geo-postgresql']['unix_socket_directory'] %>'
-psql_port='<%= node['gitlab']['geo-postgresql']['port'] %>'
+psql_host='<%= node['gitlab']['geo_postgresql']['unix_socket_directory'] %>'
+psql_port='<%= node['gitlab']['geo_postgresql']['port'] %>'
 psql_dbname='<%= node['gitlab']['geo_secondary']['db_database'] %>'

files/gitlab-cookbooks/gitlab-ee/templates/default/sv-geo-postgresql-run.erb

 #!/bin/sh
 exec 2>&1
 <%= render('mount_point_check.erb') %>
-exec chpst -P -U <%= node['postgresql']['username'] %>:<%= node['postgresql']['group'] %> -u <%= node['postgresql']['username'] %>:<%= node['postgresql']['group'] %> /opt/gitlab/embedded/bin/postgres -D <%= File.join(node['gitlab']['geo-postgresql']['dir'], 'data') %>
+exec chpst -P -U <%= node['postgresql']['username'] %>:<%= node['postgresql']['group'] %> -u <%= node['postgresql']['username'] %>:<%= node['postgresql']['group'] %> /opt/gitlab/embedded/bin/postgres -D <%= File.join(node['gitlab']['geo_postgresql']['dir'], 'data') %>

files/gitlab-cookbooks/gitlab/libraries/helpers/base_pg_helper.rb

@@ -166,9 +166,10 @@ class BasePgHelper < BaseHelper
   end
 
   def node_attributes
-    return node['gitlab'][service_name] if node['gitlab'].key?(service_name)
+    node_attribute_key = SettingsDSL::Utils.sanitized_key(service_name)
+    return node['gitlab'][node_attribute_key] if node['gitlab'].key?(node_attribute_key)
 
-    node[service_name]
+    node[node_attribute_key]
   end
 
   def is_standby?
@@ -202,14 +203,16 @@ class BasePgHelper < BaseHelper
   end
 
   def bootstrapped?
+    node_attribute_key = SettingsDSL::Utils.sanitized_key(service_name)
+
     # As part of https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2078 services are
     # being split to their own dedicated cookbooks, and attributes are being moved from
     # node['gitlab'][service_name] to node[service_name]. Until they've been moved, we
     # need to check both.
 
-    return File.exist?(File.join(node['gitlab'][service_name]['dir'], 'data', 'PG_VERSION')) if node['gitlab'].key?(service_name)
+    return File.exist?(File.join(node['gitlab'][node_attribute_key]['dir'], 'data', 'PG_VERSION')) if node['gitlab'].key?(node_attribute_key)
 
-    File.exist?(File.join(node[service_name]['dir'], 'data', 'PG_VERSION'))
+    File.exist?(File.join(node[node_attribute_key]['dir'], 'data', 'PG_VERSION'))
   end
 
   def psql_cmd(cmd_list)
@@ -243,12 +246,14 @@ class BasePgHelper < BaseHelper
   end
 
   def database_version
+    node_attribute_key = SettingsDSL::Utils.sanitized_key(service_name)
+
     # As part of https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2078 services are
     # being split to their own dedicated cookbooks, and attributes are being moved from
     # node['gitlab'][service_name] to node[service_name]. Until they've been moved, we
     # need to check both.
 
-    version_file = node['gitlab'].key?(service_name) ? "#{@node['gitlab'][service_name]['dir']}/data/PG_VERSION" : "#{@node[service_name]['dir']}/data/PG_VERSION"
+    version_file = node['gitlab'].key?(node_attribute_key) ? "#{@node['gitlab'][node_attribute_key]['dir']}/data/PG_VERSION" : "#{@node[node_attribute_key]['dir']}/data/PG_VERSION"
     PGVersion.new(File.read(version_file).chomp) if File.exist?(version_file)
   end
 

files/gitlab-cookbooks/gitlab/libraries/helpers/geo_pg_helper.rb

@@ -17,9 +17,9 @@ class GeoPgHelper < BasePgHelper
   def connection_info
     build_connection_info(
       node['gitlab']['geo_secondary']['db_database'],
-      node['gitlab']['geo-postgresql']['unix_socket_directory'],
-      node['gitlab']['geo-postgresql']['port'],
-      node['gitlab']['geo-postgresql']['sql_user']
+      node['gitlab']['geo_postgresql']['unix_socket_directory'],
+      node['gitlab']['geo_postgresql']['port'],
+      node['gitlab']['geo_postgresql']['sql_user']
     )
   end
 end

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

@@ -75,13 +75,13 @@ module Gitlab
             note: "Geo does not require Foreign Data Wrapper (FDW) to be configured to replicate data."
           },
           {
-            config_keys: %w(gitlab geo-postgresql fdw_external_user),
+            config_keys: %w(gitlab geo_postgresql fdw_external_user),
             deprecation: '13.3',
             removal: '14.0', # https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6138
             note: "Geo does not require Foreign Data Wrapper (FDW) to be configured to replicate data."
           },
           {
-            config_keys: %w(gitlab geo-postgresql fdw_external_password),
+            config_keys: %w(gitlab geo_postgresql fdw_external_password),
             deprecation: '13.3',
             removal: '14.0', # https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6138
             note: "Geo does not require Foreign Data Wrapper (FDW) to be configured to replicate data."

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

@@ -44,6 +44,7 @@ module SettingsDSL
     gitlab_kas
     geo_secondary
     geo_logcursor
+    geo_postgresql
   ].freeze
 
   def self.extended(base)

files/gitlab-cookbooks/pgbouncer/libraries/pgbouncer_helper.rb

@@ -45,20 +45,21 @@ class PgbouncerHelper < BaseHelper
   end
 
   def create_pgbouncer_user?(db)
+    node_attribute_key = SettingsDSL::Utils.sanitized_key(db)
     # As part of https://gitlab.com/gitlab-org/omnibus-gitlab/issues/2078 services are
     # being split to their own dedicated cookbooks, and attributes are being moved from
     # node['gitlab'][service_name] to node[service_name]. Until they've been moved, we
     # need to check both.
 
-    if node['gitlab'].key?(db)
-      node['gitlab'][db]['enable'] &&
-        !node['gitlab'][db]['pgbouncer_user'].nil? &&
-        !node['gitlab'][db]['pgbouncer_user_password'].nil?
+    if node['gitlab'].key?(node_attribute_key)
+      node['gitlab'][node_attribute_key]['enable'] &&
+        !node['gitlab'][node_attribute_key]['pgbouncer_user'].nil? &&
+        !node['gitlab'][node_attribute_key]['pgbouncer_user_password'].nil?
     else
       # User info for Patroni are stored under `postgresql` key
-      info_key = db == 'patroni' ? 'postgresql' : db
+      info_key = node_attribute_key == 'patroni' ? 'postgresql' : node_attribute_key
 
-      node[db]['enable'] &&
+      node[node_attribute_key]['enable'] &&
         !node[info_key]['pgbouncer_user'].nil? &&
         !node[info_key]['pgbouncer_user_password'].nil?
     end

files/gitlab-cookbooks/pgbouncer/recipes/user.rb

@@ -24,8 +24,8 @@ auth_query = node['pgbouncer']['auth_query']
 if pgb_helper.create_pgbouncer_user?('geo-postgresql')
   pgbouncer_user 'geo' do
     helper lazy { GeoPgHelper.new(node) }
-    user node['gitlab']['geo-postgresql']['pgbouncer_user']
-    password node['gitlab']['geo-postgresql']['pgbouncer_user_password']
+    user node['gitlab']['geo_postgresql']['pgbouncer_user']
+    password node['gitlab']['geo_postgresql']['pgbouncer_user_password']
     database node['gitlab']['geo_secondary']['db_database']
     add_auth_function default_auth_query.eql?(auth_query)
     action :create

files/gitlab-ctl-commands/pg-upgrade.rb

@@ -57,7 +57,7 @@ add_command_under_category 'revert-pg-upgrade', 'database',
       options[:tmp_dir],
       options[:timeout]
     )
-    geo_db_worker.data_dir = File.join(@attributes['gitlab']['geo-postgresql']['dir'], 'data')
+    geo_db_worker.data_dir = File.join(@attributes['gitlab']['geo_postgresql']['dir'], 'data')
     geo_db_worker.tmp_data_dir = "#{geo_db_worker.tmp_dir}/geo-data" unless geo_db_worker.tmp_dir.nil?
     geo_db_worker.psql_command = 'gitlab-geo-psql'
   end
@@ -192,7 +192,7 @@ add_command_under_category 'pg-upgrade', 'database',
   unless options[:skip_disk_check]
     check_dirs = [@db_worker.tmp_dir]
     check_dirs << @db_worker.data_dir if pg_enabled || patroni_enabled
-    check_dirs << File.join(@attributes['gitlab']['geo-postgresql']['dir'], 'data') if geo_enabled
+    check_dirs << File.join(@attributes['gitlab']['geo_postgresql']['dir'], 'data') if geo_enabled
 
     check_dirs.compact.uniq.each do |dir|
       unless GitlabCtl::Util.progress_message(
@@ -473,7 +473,7 @@ def geo_pg_upgrade
   log('Upgrading the geo-postgresql database')
   # Secondary nodes have a replica db under /var/opt/gitlab/postgresql that needs
   # the bin files updated and the geo tracking db under /var/opt/gitlab/geo-postgresl that needs data updated
-  data_dir = File.join(@attributes['gitlab']['geo-postgresql']['dir'], 'data')
+  data_dir = File.join(@attributes['gitlab']['geo_postgresql']['dir'], 'data')
 
   @db_service_name = 'geo-postgresql'
   @db_worker.data_dir = data_dir

gitlab-ci-config/check-packages.yml

@@ -133,11 +133,11 @@ Ubuntu-20.04-fips-check:
 CentOS-7-check:
   image: "${BUILDER_IMAGE_REGISTRY}/centos_7:${BUILDER_IMAGE_REVISION}"
   extends: .yum-install
-CentOS-8-check:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8:${BUILDER_IMAGE_REVISION}"
   extends: .yum-install
-CentOS-8-arm64-check:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_arm64:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-arm64-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_arm64:${BUILDER_IMAGE_REVISION}"
   extends: .yum-install
   tags:
   - docker-arm-builder
@@ -157,8 +157,8 @@ AmazonLinux-2022-arm64-check:
   extends: .yum-install
   tags:
   - docker-arm-builder
-CentOS-8-fips-check:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_fips:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-fips-check:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
   extends:
     - .yum-install
     - .ee-tag-only

gitlab-ci-config/dev-gitlab-org.yml

@@ -318,11 +318,11 @@ Ubuntu-22.04-arm-branch:
 CentOS-7-branch:
   image: "${BUILDER_IMAGE_REGISTRY}/centos_7:${BUILDER_IMAGE_REVISION}"
   extends: .branch_template
-CentOS-8-branch:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8:${BUILDER_IMAGE_REVISION}"
   extends: .branch_template
-CentOS-8-arm64-branch:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_arm64:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-arm64-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_arm64:${BUILDER_IMAGE_REVISION}"
   extends: .branch_template
   tags:
   - docker-arm-builder
@@ -369,8 +369,8 @@ SLES-15.2-branch:
 AmazonLinux-2-fips-branch:
   image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2_fips:${BUILDER_IMAGE_REVISION}"
   extends: .fips_branch_template
-CentOS-8-fips-branch:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_fips:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-fips-branch:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
   extends: .fips_branch_template
 Ubuntu-18.04-fips-branch:
   image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04_fips:${BUILDER_IMAGE_REVISION}"
@@ -458,7 +458,7 @@ RAT-Nightly:
 # This job runs only on nightly EE builds
 RAT-Nightly-FIPS:
   stage: slow_jobs
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_fips:${BUILDER_IMAGE_REVISION}"
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
   variables:
     USE_SYSTEM_SSL: "true"
     RAT_REFERENCE_ARCHITECTURE: "omnibus-gitlab-mrs-fips"
@@ -466,7 +466,7 @@ RAT-Nightly-FIPS:
     - bundle exec rake qa:rat:nightly
   cache: !reference [.branch-cache]
   needs:
-    - CentOS-8-fips-branch
+    - AlmaLinux-8-fips-branch
   allow_failure: true
   rules:
     - !reference [.default_rules, rules]
@@ -619,11 +619,11 @@ Ubuntu-22.04-arm:
 CentOS-7:
   image: "${BUILDER_IMAGE_REGISTRY}/centos_7:${BUILDER_IMAGE_REVISION}"
   extends: .tag_template
-CentOS-8:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8:${BUILDER_IMAGE_REVISION}"
   extends: .tag_template
-CentOS-8-arm64:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_arm64:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-arm64:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_arm64:${BUILDER_IMAGE_REVISION}"
   extends: .tag_template
   tags:
   - docker-arm-builder
@@ -666,8 +666,8 @@ SLES-15.2:
 AmazonLinux-2-fips:
   image: "${BUILDER_IMAGE_REGISTRY}/amazonlinux_2_fips:${BUILDER_IMAGE_REVISION}"
   extends: .fips_tag_template
-CentOS-8-fips:
-  image: "${BUILDER_IMAGE_REGISTRY}/centos_8_fips:${BUILDER_IMAGE_REVISION}"
+AlmaLinux-8-fips:
+  image: "${BUILDER_IMAGE_REGISTRY}/almalinux_8_fips:${BUILDER_IMAGE_REVISION}"
   extends: .fips_tag_template
 Ubuntu-18.04-fips:
   image: "${BUILDER_IMAGE_REGISTRY}/ubuntu_18.04_fips:${BUILDER_IMAGE_REVISION}"
@@ -746,19 +746,19 @@ CentOS-7-staging:
       optional: true
     - job: CentOS-7-branch
       optional: true
-CentOS-8-staging:
+AlmaLinux-8-staging:
   extends: .staging_upload_template
   needs:
-    - job: CentOS-8
+    - job: AlmaLinux-8
       optional: true
-    - job: CentOS-8-branch
+    - job: AlmaLinux-8-branch
       optional: true
-CentOS-8-arm64-staging:
+AlmaLinux-8-arm64-staging:
   extends: .staging_upload_template
   needs:
-    - job: CentOS-8-arm64
+    - job: AlmaLinux-8-arm64
       optional: true
-    - job: CentOS-8-arm64-branch
+    - job: AlmaLinux-8-arm64-branch
       optional: true
 OpenSUSE-15.4-staging:
   extends: .staging_upload_template
@@ -829,12 +829,12 @@ AmazonLinux-2-fips-staging:
       optional: true
     - job: AmazonLinux-2-fips-branch
       optional: true
-CentOS-8-fips-staging:
+AlmaLinux-8-fips-staging:
   extends: .fips_staging_upload_template
   needs:
-    - job: CentOS-8-fips
+    - job: AlmaLinux-8-fips
       optional: true
-    - job: CentOS-8-fips-branch
+    - job: AlmaLinux-8-fips-branch
       optional: true
 Ubuntu-18.04-fips-staging:
   extends: .fips_staging_upload_template
@@ -892,14 +892,14 @@ CentOS-7-release:
   extends: .production_release_template
   needs:
     - CentOS-7
-CentOS-8-release:
+AlmaLinux-8-release:
   extends: .production_release_template
   needs:
-    - CentOS-8
-CentOS-8-arm64-release:
+    - AlmaLinux-8
+AlmaLinux-8-arm64-release:
   extends: .production_release_template
   needs:
-    - CentOS-8-arm64
+    - AlmaLinux-8-arm64
 OpenSUSE-15.4-release:
   extends: .production_release_template
   needs:
@@ -946,10 +946,10 @@ AmazonLinux-2-fips-release:
   extends: .fips_release_template
   needs:
     - AmazonLinux-2-fips
-CentOS-8-fips-release:
+AlmaLinux-8-fips-release:
   extends: .fips_release_template
   needs:
-    - CentOS-8-fips
+    - AlmaLinux-8-fips
 Ubuntu-18.04-fips-release:
   extends: .fips_release_template
   needs:

gitlab-ci-config/gitlab-com.yml

@@ -98,7 +98,7 @@
     - if: '$PIPELINE_TYPE == "TRIGGER_CACHE_UPDATE_PIPELINE"'
 
 .spec_template: &spec_template
-  extends: .gems-cache
+  extends: .gems-cache-os-dependent
   stage: tests
   before_script:
     # These jobs will not be run on dev, so we set ALTERNATIVE_SOURCES to true
@@ -392,7 +392,7 @@ danger-review:
     - if: '$PIPELINE_TYPE =~ /_MR_PIPELINE$/'
 
 Centos 7 knapsack: !reference [.knapsack]
-Centos 8 knapsack: !reference [.knapsack]
+AlmaLinux 8 knapsack: !reference [.knapsack]
 Debian 10 knapsack: !reference [.knapsack]
 Debian 11 knapsack: !reference [.knapsack]
 OpenSUSE 15.4 knapsack: !reference [.knapsack]
@@ -460,12 +460,12 @@ Centos 7 specs :
   parallel: 6
   needs:
   - Centos 7 knapsack
-Centos 8 specs :
-  image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/centos_8-ruby:${BUILDER_IMAGE_REVISION}"
+AlmaLinux 8 specs :
+  image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/almalinux_8-ruby:${BUILDER_IMAGE_REVISION}"
   extends: .chef_spec_template
   parallel: 6
   needs:
-  - Centos 8 knapsack
+  - AlmaLinux 8 knapsack
 OpenSUSE 15.4 specs :
   image: "${PUBLIC_BUILDER_IMAGE_REGISTRY}/opensuse_15.4-ruby:${BUILDER_IMAGE_REVISION}"
   extends: .chef_spec_template