Add cleanup of disabled consul watcher files

What does this MR do?

Add cleanup of disabled consul watcher files
    
After disabling/renaming/removing a consul service
its watcher and configuration files were not
cleaned up.
    
An example of this problem arises during upgrades
of Patroni clusters.
    
Changelog: fixed

Related issues

Closes #7293 (closed)

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

• Merge Request Title, and Description are up to date, accurate, and descriptive
• MR targeting the appropriate branch
• MR has a green pipeline on GitLab.com
• Pipeline is green on dev.gitlab.org if the change is touching anything besides documentation or internal cookbooks
• trigger-package has a green pipeline running against latest commit

Expected (please provide an explanation if not completing)

• Test plan indicating conditions for success has been posted and passes
• Documentation created/updated
  • MR to remove rm note in the docs: Remove workaround from PostgreSQL replication docs (gitlab!114592 - merged)
• Tests added
• Integration tests added to GitLab QA
• Equivalent MR/issue for the GitLab Chart opened

changed milestone to %15.10

added Deliverable Patroni bugfunctional consul devopssystems groupdistribution group::distributiondeploy priority2 sectioncore platform severity2 typebug workflowin dev labels

assigned to @clemensbeck

	1 Warning
	You've made some changes at the locations which contain user facing configuration. That's OK as long as you're refactoring existing code and not adding any new configuration. If you are adding new user facing configuration, consider adding to gitlab.rb.template located in files/gitlab-config-template/gitlab.rb.template . Otherwise, please consider adding the typemaintenance label in that case.

If needed, you can retry the danger-review job that generated this comment.

Generated by Danger

marked the checklist item Merge Request Title, and Description are up to date, accurate, and descriptive as completed

marked the checklist item MR targeting the appropriate branch as completed

added 1 commit

• 8858ec30 - Add cleanup of disabled consul watcher files

Compare with previous version

added 1 commit

• b2187c0a - Add cleanup of disabled consul watcher files

Compare with previous version

added 1 commit

• 2fc07574 - Add cleanup of disabled consul watcher files

Compare with previous version

changed the description

added 1 commit

• 149f69ca - Add cleanup of disabled consul watcher files

Compare with previous version

added 1 commit

• 412c8624 - Add cleanup of disabled consul watcher files

Compare with previous version

added 1 commit

• ccfca3d3 - Add cleanup of disabled consul watcher files

Compare with previous version

mentioned in merge request gitlab!114592 (merged)

marked the checklist item Documentation created/updated as completed

marked the checklist item MR has a green pipeline on GitLab.com as completed

added 1 commit

• f0e9a6e3 - Add cleanup of disabled consul watcher files

Compare with previous version

changed the description

added 1 commit

• 54803fd6 - Fix service name of consul specific psql watcher settings

Compare with previous version

Test Plan

1. Deploy GitLab (EE) with Consul and the PostgreSQL watcher enabled

consul['enable'] = true
# consul['internal']['postgresql_service_name'] = 'postgresql'
consul['watchers'] = %(postgresql)

• verify /var/opt/gitlab/consul/config.d/watcher_postgresql.json exists
• verify /var/opt/gitlab/consul/scripts/failover_postgresql_in_pgbouncer exists

2. Change the PostgreSQL watchers name and reconfigure (using the current recipes)

consul['enable'] = true
consul['internal']['postgresql_service_name'] = 'newpsql'
consul['watchers'] = %(newpsql)

• verify /var/opt/gitlab/consul/config.d/watcher_newpsql.json exists
• verify /var/opt/gitlab/consul/config.d/watcher_postgresql.json exists
• verify /var/opt/gitlab/consul/scripts/failover_postgresql_in_pgbouncer exists

3. Change to the updated watcher recipe of this MR and reconfigure

• verify /var/opt/gitlab/consul/config.d/watcher_postgresql.json was removed