Merge branch 'master' into 'master'

feat: account for potential consul port override to determine patroni leader

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

Merged-by: Yu Shao Pang (SQPC) <yushao.pang@squarepoint-capital.com>

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')

files/gitlab-ctl-commands-ee/lib/postgresql/ee.rb

@@ -7,6 +7,7 @@ module GitlabCtl
         def get_primary
           node_attributes = GitlabCtl::Util.get_node_attributes
           consul_enable = node_attributes.dig('consul', 'enable')
+          consul_dns_port = node_attributes.dig('consul', 'configuration', 'ports', 'dns') || 8600
           postgresql_service_name = node_attributes.dig('patroni', 'scope')
 
           raise 'Consul agent is not enabled on this node' unless consul_enable
@@ -14,7 +15,7 @@ module GitlabCtl
           raise 'PostgreSQL service name is not defined' if postgresql_service_name.nil? || postgresql_service_name.empty?
 
           result = []
-          Resolv::DNS.open(nameserver_port: [['127.0.0.1', 8600]]) do |dns|
+          Resolv::DNS.open(nameserver_port: [['127.0.0.1', consul_dns_port]]) do |dns|
             ['master', 'standby-leader'].each do |postgresql_primary_service_name|
               result = dns.getresources("#{postgresql_primary_service_name}.#{postgresql_service_name}.service.consul", Resolv::DNS::Resource::IN::SRV).map do |srv|
                 "#{dns.getaddress(srv.target)}:#{srv.port}"

spec/chef/gitlab-ctl-commands-ee/lib/postgresql/ee_spec.rb

@@ -37,6 +37,7 @@ RSpec.describe GitlabCtl::PostgreSQL::EE do
     end
 
     context 'when required settings are available' do
+      let(:dns_double) { instance_double(Resolv::DNS) }
       before do
         allow(GitlabCtl::Util).to receive(:get_node_attributes)
           .and_return(
@@ -49,17 +50,59 @@ RSpec.describe GitlabCtl::PostgreSQL::EE do
               }
             }
           )
-        allow_any_instance_of(Resolv::DNS).to receive(:getresources)
+        allow(Resolv::DNS).to receive(:open).and_return(dns_double)
+        allow(dns_double).to receive(:getresources)
           .with('master.fake.service.consul', Resolv::DNS::Resource::IN::SRV)
           .and_return([Struct.new(:target, :port).new('fake.address', 6432)])
-        allow_any_instance_of(Resolv::DNS).to receive(:getaddress)
+        allow(dns_double).to receive(:getaddress)
           .with('fake.address')
           .and_return('1.2.3.4')
       end
 
+      it 'initializes Resolv::DNS with port 8600' do
+        expect(Resolv::DNS).to receive(:open).with(nameserver_port: [['127.0.0.1', 8600]])
+      end
+
       it 'should get the list of PostgreSQL endpoints' do
         expect(described_class.get_primary).to eq ['1.2.3.4:6432']
       end
     end
   end
+
+  context 'when consul has a dns port override' do
+    let(:dns_double) { instance_double(Resolv::DNS) }
+    before do
+      allow(GitlabCtl::Util).to receive(:get_node_attributes)
+        .and_return(
+          {
+            'consul' => {
+              'enable' => true,
+              'configuration' => {
+                "ports" => {
+                  "dns" => 18600
+                }
+              }
+            },
+            'patroni' => {
+              'scope' => 'fake'
+            }
+          }
+        )
+      allow(Resolv::DNS).to receive(:open).and_return(dns_double)
+      allow(dns_double).to receive(:getresources)
+        .with('master.fake.service.consul', Resolv::DNS::Resource::IN::SRV)
+        .and_return([Struct.new(:target, :port).new('fake.address', 6432)])
+      allow(dns_double).to receive(:getaddress)
+        .with('fake.address')
+        .and_return('1.2.3.4')
+    end
+
+    it 'initializes Resolv::DNS with port 18600' do
+      expect(Resolv::DNS).to receive(:open).with(nameserver_port: [['127.0.0.1', 18600]])
+    end
+
+    it 'should get the list of PostgreSQL endpoints' do
+      expect(described_class.get_primary).to eq ['1.2.3.4:6432']
+    end
+  end
 end