Merge branch 'sh-fix-patroni' into 'master'

Fix patroni no longer working with update to ydiff 1.3

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

Merged-by: Jason Plum <[email protected]>
Approved-by: Jason Plum <[email protected]>
Approved-by: João Alexandre Cunha <[email protected]>
Co-authored-by: Stan Hu <[email protected]>

Author: WarheadsSE

config/software/patroni.rb

@@ -35,5 +35,13 @@
   # https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5701
   command "#{install_dir}/embedded/bin/pip3 install prettytable==0.7.2", env: env
 
+  # Pin ydiff to 1.2 since 1.3 requires cdiff:
+  # https://github.com/zalando/patroni/blob/634b44ee0586f063033074806a42b534a354cbff/docs/releases.rst
+  # According to Patroni 3.3.0 release notes, upgrading to this version
+  # should be enough to fix this problem. We should test unpinning
+  # this library once we update to Patroni 3.3.0.
+  # See: https://github.com/zalando/patroni/blob/634b44ee0586f063033074806a42b534a354cbff/docs/releases.rst
+  command "#{install_dir}/embedded/bin/pip3 install ydiff==1.2", env: env
+
   command "#{install_dir}/embedded/bin/pip3 install patroni[consul]==#{version}", env: env
 end