diff --git a/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb b/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb index 74a394e1660bf8d7fe8b4497239c5c07436b3d0e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5LnJi..4bc6db70c1f458cae97066c98bc87ea09b268c94_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5LnJi 100644 --- a/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb +++ b/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary.rb @@ -29,14 +29,6 @@ dependent_services = %w(puma geo-logcursor sidekiq) -# TODO: To be removed in 15.0. See https://gitlab.com/gitlab-org/gitlab/-/issues/351946 -templatesymlink 'Remove the deprecated database_geo.yml symlink' do - link_from File.join(gitlab_rails_source_dir, 'config/database_geo.yml') - link_to File.join(gitlab_rails_etc_dir, 'database_geo.yml') - - action :delete -end - templatesymlink 'Add the geo database settings to database.yml and create a symlink to Rails root' do link_from File.join(gitlab_rails_source_dir, 'config/database.yml') link_to File.join(gitlab_rails_etc_dir, 'database.yml') diff --git a/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary_disable.rb b/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary_disable.rb index 74a394e1660bf8d7fe8b4497239c5c07436b3d0e_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5X2Rpc2FibGUucmI=..4bc6db70c1f458cae97066c98bc87ea09b268c94_ZmlsZXMvZ2l0bGFiLWNvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5X2Rpc2FibGUucmI= 100644 --- a/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary_disable.rb +++ b/files/gitlab-cookbooks/gitlab-ee/recipes/geo-secondary_disable.rb @@ -23,14 +23,6 @@ dependent_services = %w(puma sidekiq) -# TODO: To be removed in 15.0. See https://gitlab.com/gitlab-org/gitlab/-/issues/351946 -templatesymlink 'Remove the deprecated database_geo.yml symlink' do - link_from File.join(gitlab_rails_source_dir, 'config/database_geo.yml') - link_to File.join(gitlab_rails_etc_dir, 'database_geo.yml') - - action :delete -end - templatesymlink 'Removes the geo database settings from database.yml and create a symlink to Rails root' do link_from File.join(gitlab_rails_source_dir, 'config/database.yml') link_to File.join(gitlab_rails_etc_dir, 'database.yml') diff --git a/spec/chef/cookbooks/gitlab-ee/recipes/geo-secondary_disable_spec.rb b/spec/chef/cookbooks/gitlab-ee/recipes/geo-secondary_disable_spec.rb index 74a394e1660bf8d7fe8b4497239c5c07436b3d0e_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5X2Rpc2FibGVfc3BlYy5yYg==..4bc6db70c1f458cae97066c98bc87ea09b268c94_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5X2Rpc2FibGVfc3BlYy5yYg== 100644 --- a/spec/chef/cookbooks/gitlab-ee/recipes/geo-secondary_disable_spec.rb +++ b/spec/chef/cookbooks/gitlab-ee/recipes/geo-secondary_disable_spec.rb @@ -15,14 +15,6 @@ stub_gitlab_rb(geo_secondary_role: { enable: false }) end - context 'database_geo.yml' do - it 'removes the database_geo.yml symlink' do - expect(chef_run).to delete_templatesymlink('Remove the deprecated database_geo.yml symlink') - .with(link_to: '/var/opt/gitlab/gitlab-rails/etc/database_geo.yml', - link_from: '/opt/gitlab/embedded/service/gitlab-rails/config/database_geo.yml') - end - end - context 'database.yml' do shared_examples 'removes Geo database settings' do it 'renders database.yml without geo database' do diff --git a/spec/chef/cookbooks/gitlab-ee/recipes/geo-secondary_spec.rb b/spec/chef/cookbooks/gitlab-ee/recipes/geo-secondary_spec.rb index 74a394e1660bf8d7fe8b4497239c5c07436b3d0e_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5X3NwZWMucmI=..4bc6db70c1f458cae97066c98bc87ea09b268c94_c3BlYy9jaGVmL2Nvb2tib29rcy9naXRsYWItZWUvcmVjaXBlcy9nZW8tc2Vjb25kYXJ5X3NwZWMucmI= 100644 --- a/spec/chef/cookbooks/gitlab-ee/recipes/geo-secondary_spec.rb +++ b/spec/chef/cookbooks/gitlab-ee/recipes/geo-secondary_spec.rb @@ -85,14 +85,6 @@ end shared_examples 'renders database.yml without geo database' do - context 'database_geo.yml' do - it 'removes the database_geo.yml symlink' do - expect(chef_run).to delete_templatesymlink('Remove the deprecated database_geo.yml symlink') - .with(link_to: '/var/opt/gitlab/gitlab-rails/etc/database_geo.yml', - link_from: '/opt/gitlab/embedded/service/gitlab-rails/config/database_geo.yml') - end - end - context 'database.yml' do it 'renders database.yml without geo database' do expect(database_yml[:production].keys).not_to include(:geo) @@ -120,14 +112,6 @@ end shared_examples 'renders database.yml with both main and geo databases' do - context 'database_geo.yml' do - it 'removes the database_geo.yml symlink' do - expect(chef_run).to delete_templatesymlink('Remove the deprecated database_geo.yml symlink') - .with(link_to: '/var/opt/gitlab/gitlab-rails/etc/database_geo.yml', - link_from: '/opt/gitlab/embedded/service/gitlab-rails/config/database_geo.yml') - end - end - context 'database.yml' do context 'with default settings' do it 'renders database.yml with main stanza first' do