Automatic merge of gitlab-org/omnibus-gitlab master

changelogs/unreleased/ps-postgres-proxy.yml

+---
+title: Praefect configuration for database with no proxy
+merge_request: 4583
+author:
+type: added

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

@@ -1996,8 +1996,8 @@ gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = nil
 # praefect['sentry_dsn'] = "https://<key>:<secret>@sentry.io/<project>"
 # praefect['sentry_environment'] = "production"
 # praefect['auto_migrate'] = true
-# praefect['database_host'] = 'postgres.internal'
-# praefect['database_port'] = 5432
+# praefect['database_host'] = 'postgres.external'
+# praefect['database_port'] = 6432
 # praefect['database_user'] = 'praefect'
 # praefect['database_password'] = 'secret'
 # praefect['database_dbname'] = 'praefect_production'
@@ -2007,6 +2007,8 @@ gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = nil
 # praefect['database_sslrootcert'] = '/path/to/rootcert'
 # praefect['reconciliation_scheduling_interval'] = '5m'
 # praefect['reconciliation_histogram_buckets'] = '[0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0]'
+# praefect['database_host_no_proxy'] = 'postgres.internal'
+# praefect['database_port_no_proxy'] = 5432
 ################################################################################
 # Storage check

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

@@ -27,6 +27,8 @@ default['praefect']['database_sslmode'] = nil
 default['praefect']['database_sslcert'] = nil
 default['praefect']['database_sslkey'] = nil
 default['praefect']['database_sslrootcert'] = nil
+default['praefect']['database_host_no_proxy'] = nil
+default['praefect']['database_port_no_proxy'] = nil
 default['praefect']['tls_listen_addr'] = nil
 default['praefect']['certificate_path'] = nil
 default['praefect']['key_path'] = nil

files/gitlab-cookbooks/praefect/templates/default/praefect-config.toml.erb

@@ -81,7 +81,8 @@ token = '<%= node['token'] %>'
 <%= "sslcert = '#{@database_sslcert}'" if @database_sslcert %>
 <%= "sslkey = '#{@database_sslkey}'" if @database_sslkey %>
 <%= "sslrootcert = '#{@database_sslrootcert}'" if @database_sslrootcert %>
-
+<%= "host_no_proxy = '#{@database_host_no_proxy}'" if @database_host_no_proxy %>
+<%= "port_no_proxy = #{@database_port_no_proxy}" if @database_port_no_proxy %>
 <% if @prometheus_grpc_latency_buckets %>
 # # You can optionally configure Gitaly to record histogram latencies on GRPC method calls

spec/chef/recipes/praefect_spec.rb

@@ -102,8 +102,8 @@ RSpec.describe 'praefect' do
       end
       let(:failover_enabled) { true }
       let(:failover_election_strategy) { 'local' }
-      let(:database_host) { 'pg.internal' }
-      let(:database_port) { 1234 }
+      let(:database_host) { 'pg.external' }
+      let(:database_port) { 2234 }
       let(:database_user) { 'praefect-pg' }
       let(:database_password) { 'praefect-pg-pass' }
       let(:database_dbname) { 'praefect_production' }
@@ -112,6 +112,8 @@ RSpec.describe 'praefect' do
       let(:database_sslkey) { '/path/to/client-key' }
       let(:database_sslrootcert) { '/path/to/rootcert' }
       let(:database_sslrootcert) { '/path/to/rootcert' }
+      let(:database_host_no_proxy) { 'pg.internal' }
+      let(:database_port_no_proxy) { 1234 }
       let(:reconciliation_scheduling_interval) { '1m' }
       let(:reconciliation_histogram_buckets) { '[1.0, 2.0]' }
@@ -143,6 +145,8 @@ RSpec.describe 'praefect' do
                          database_sslcert: database_sslcert,
                          database_sslkey: database_sslkey,
                          database_sslrootcert: database_sslrootcert,
+                         database_host_no_proxy: database_host_no_proxy,
+                         database_port_no_proxy: database_port_no_proxy,
                          reconciliation_scheduling_interval: reconciliation_scheduling_interval,
                          reconciliation_histogram_buckets: reconciliation_histogram_buckets
                        })
@@ -202,6 +206,8 @@ RSpec.describe 'praefect' do
           %r{sslcert = '#{database_sslcert}'},
           %r{sslkey = '#{database_sslkey}'},
           %r{sslrootcert = '#{database_sslrootcert}'},
+          %r{host_no_proxy = '#{database_host_no_proxy}'},
+          %r{port_no_proxy = #{database_port_no_proxy}},
         ].map(&:to_s).join('\n'))
         expect(chef_run).to render_file(config_path).with_content(database_section)