Merge branch 'sh-allow-redis-multiple-bind' into 'master'

Accept multiple bind addresses in Redis config

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

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Hossein Pursultani <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Stan Hu <[email protected]>

Author: balasankarc

files/gitlab-cookbooks/gitlab/libraries/redis.rb

@@ -78,8 +78,9 @@ def parse_redis_daemon!
       return unless redis_managed?
 
       redis_bind = Gitlab['redis']['bind'] || node['redis']['bind']
+      Gitlab['redis']['default_host'] = redis_bind.split(' ').first
 
-      Gitlab['gitlab_rails']['redis_host'] ||= redis_bind
+      Gitlab['gitlab_rails']['redis_host'] ||= Gitlab['redis']['default_host']
 
       redis_port_config_key = if Gitlab['redis'].key?('port') && !Gitlab['redis']['port'].zero?
                                 # If Redis is specified to run on a non-TLS port

files/gitlab-cookbooks/package/libraries/helpers/new_redis_helper/server.rb

@@ -51,7 +51,7 @@ def redis_cli_connect_options
     end
 
     def redis_cli_tcp_connect_options(args)
-      args << ["-h #{redis['bind']}"]
+      args << ["-h #{redis['default_host']}"]
       port = redis['port'].to_i
 
       if port.zero?

files/gitlab-cookbooks/redis/templates/default/gitlab-redis-cli-rc.erb

@@ -1,5 +1,5 @@
 redis_dir='<%= node['redis']['dir'] %>'
-redis_host='<%= node['redis']['bind'] %>'
+redis_host='<%= node['redis']['default_host'] %>'
 redis_port='<%= node['redis']['port'] %>'
 redis_tls_port='<%= node['redis']['tls_port'] %>'
 redis_tls_auth_clients='<%= node['redis']['tls_auth_clients'] %>'

spec/chef/cookbooks/gitlab/libraries/redis_spec.rb

@@ -31,6 +31,23 @@
       let(:redis_host) { '1.2.3.4' }
       let(:redis_port) { 6370 }
 
+      context 'when binding to multiple addresses' do
+        before do
+          stub_gitlab_rb(
+            redis: {
+              bind: '1.2.3.4 5.6.7.8',
+              port: redis_port
+            }
+          )
+        end
+
+        it 'expects redis_host to match first bind value from redis' do
+          expect(node['gitlab']['gitlab_rails']['redis_host']).to eq '1.2.3.4'
+
+          subject.parse_redis_settings
+        end
+      end
+
       context 'when not using sentinels' do
         before do
           stub_gitlab_rb(

spec/chef/cookbooks/redis/recipes/redis_spec.rb

@@ -12,7 +12,7 @@
     let(:gitlab_redis_cli_rc) do
       <<-EOF
 redis_dir='/var/opt/gitlab/redis'
-redis_host='127.0.0.1'
+redis_host=''
 redis_port='0'
 redis_tls_port=''
 redis_tls_auth_clients='optional'
@@ -201,6 +201,46 @@
     end
   end
 
+  context 'with multiple bind addresses' do
+    let(:redis_host) { '1.2.3.4 5.6.7.8' }
+    let(:redis_port) { 6370 }
+    let(:master_ip) { '10.0.0.0' }
+    let(:master_port) { 6371 }
+
+    let(:gitlab_redis_cli_rc) do
+      <<-EOF
+redis_dir='/var/opt/gitlab/redis'
+redis_host='1.2.3.4'
+redis_port='6370'
+redis_tls_port=''
+redis_tls_auth_clients='optional'
+redis_tls_cacert_file='/opt/gitlab/embedded/ssl/certs/cacert.pem'
+redis_tls_cacert_dir='/opt/gitlab/embedded/ssl/certs/'
+redis_tls_cert_file=''
+redis_tls_key_file=''
+redis_socket=''
+      EOF
+    end
+
+    before do
+      stub_gitlab_rb(
+        redis: {
+          bind: redis_host,
+          port: redis_port,
+          master_ip: master_ip,
+          master_port: master_port,
+          master_password: 'password',
+          master: false
+        }
+      )
+    end
+
+    it 'creates gitlab-redis-cli-rc' do
+      expect(chef_run).to render_file('/opt/gitlab/etc/gitlab-redis-cli-rc')
+        .with_content(gitlab_redis_cli_rc)
+    end
+  end
+
   context 'with a replica configured' do
     let(:redis_host) { '1.2.3.4' }
     let(:redis_port) { 6370 }