Merge branch '8288-default-to-pg-14' into 'master'

Default to PostgreSQL 14 for fresh installations

Closes #8288

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

Merged-by: Ian Baum <[email protected]>
Approved-by: Ian Baum <[email protected]>
Approved-by: Jason Plum <[email protected]>
Reviewed-by: Jason Plum <[email protected]>
Co-authored-by: Clemens Beck <[email protected]>

Author: ibaum

config/software/postgresql.rb

@@ -58,16 +58,6 @@
 
   make "world -j #{workers}", env: env
   make 'install-world', env: env
-
-  # NOTE: There are several dependencies which require these files in these
-  # locations and have dependency on `postgresql_new`. So when this block is
-  # changed to be in the `postgresql` software definition for default PG
-  # version changes, change those dependencies to `postgresql`.
-  block 'link bin files' do
-    Dir.glob("#{prefix}/bin/*").each do |bin_file|
-      link bin_file, "#{install_dir}/embedded/bin/#{File.basename(bin_file)}"
-    end
-  end
 end
 
 # exclude headers and static libraries from package

config/software/postgresql_new.rb

@@ -61,6 +61,16 @@
   make 'install-world', env: env
 
   link "#{prefix}/lib/#{libpq}", "#{install_dir}/embedded/lib/#{libpq}"
+
+  # NOTE: There are several dependencies which require these files in these
+  # locations and have dependency on `postgresql_new`. So when this block is
+  # changed to be in the `postgresql` software definition for default PG
+  # version changes, change those dependencies to `postgresql`.
+  block 'link bin files' do
+    Dir.glob("#{prefix}/bin/*").each do |bin_file|
+      link bin_file, "#{install_dir}/embedded/bin/#{File.basename(bin_file)}"
+    end
+  end
 end
 
 # exclude headers and static libraries from package

doc/settings/database.md

@@ -42,7 +42,7 @@ of that setting in the running PostgreSQL instance.
 #### Automatic restart when the PostgreSQL version changes
 
 By default, Linux package installations automatically restart PostgreSQL when the underlying
-version changes, as suggested by the [upstream documentation](https://www.postgresql.org/docs/13/upgrading.html).
+version changes, as suggested by the [upstream documentation](https://www.postgresql.org/docs/14/upgrading.html).
 This behavior can be controlled using the `auto_restart_on_version_change` setting
 available for `postgresql` and `geo-postgresql`.
 
@@ -73,7 +73,7 @@ to avoid errors like the [one related to loading necessary libraries](#could-not
 Linux package installations automatically enable SSL on the PostgreSQL server, but it will accept
 both encrypted and unencrypted connections by default. Enforcing SSL requires
 using the `hostssl` configuration in `pg_hba.conf`. For more details, see the
-[`pg_hba.conf` documentation](https://www.postgresql.org/docs/13/auth-pg-hba-conf.html).
+[`pg_hba.conf` documentation](https://www.postgresql.org/docs/14/auth-pg-hba-conf.html).
 
 SSL support depends on the following files:
 

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

@@ -746,7 +746,7 @@ def old_version
 end
 
 def default_version
-  PGVersion.parse(version_from_manifest('postgresql'))
+  PGVersion.parse(version_from_manifest('postgresql_new')) || PGVersion.parse(version_from_manifest('postgresql'))
 end
 
 def new_version