From 8e7151c2227183bb80f6f81147f8ecde3e656c6f Mon Sep 17 00:00:00 2001
From: Vitaliy Kukharik <37010174+vitabaks@users.noreply.github.com>
Date: Tue, 16 Apr 2024 14:20:21 +0300
Subject: [PATCH] Update WAL-G to v3.0.0 (#629)

---
 README.md                  |  2 +-
 roles/wal-g/tasks/main.yml | 16 +++++-----------
 vars/Debian.yml            |  1 -
 vars/main.yml              |  2 +-
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 9cc56da2e..d3498e88e 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ RedHat and Debian based distros (x86_64)
 
 ###### Supported Linux Distributions:
 - **Debian**: 10, 11, 12
-- **Ubuntu**: 18.04, 20.04, 22.04
+- **Ubuntu**: 20.04, 22.04
 - **CentOS**: 7, 8
 - **CentOS Stream**: 8, 9
 - **Oracle Linux**: 7, 8, 9
diff --git a/roles/wal-g/tasks/main.yml b/roles/wal-g/tasks/main.yml
index 313382284..f43b8d52c 100644
--- a/roles/wal-g/tasks/main.yml
+++ b/roles/wal-g/tasks/main.yml
@@ -21,7 +21,7 @@
     - wal_g_installed_version.stdout == wal_g_version
   tags: wal-g, wal_g, wal_g_install
 
-# Install WAL-G from a precompiled binary for Ubuntu 18.04 and 20.04
+# Install WAL-G from a precompiled binary for Ubuntu 20.04
 - block:
     - name: "Download WAL-G v{{ wal_g_version }} binary"
       ansible.builtin.get_url:
@@ -48,11 +48,8 @@
   when:
     - installation_method == "repo"
     - wal_g_version is version('1.0', '>=')
-    - (wal_g_installed_version.stderr is search("command not found") or
-       wal_g_installed_version.stdout != wal_g_version)
-    - (ansible_distribution == 'Ubuntu' and
-       (ansible_distribution_version is version('18.04', '==') or
-        ansible_distribution_version is version('20.04', '==')))
+    - (wal_g_installed_version.stderr is search("command not found") or wal_g_installed_version.stdout != wal_g_version)
+    - (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04')
   tags: wal-g, wal_g, wal_g_install
 
 # Build WAL-G from source code for other Linux distributions
@@ -165,11 +162,8 @@
   when:
     - installation_method == "repo"
     - wal_g_version is version('1.0', '>=')
-    - (wal_g_installed_version.stderr is search("command not found") or
-       wal_g_installed_version.stdout != wal_g_version)
-    - not (ansible_distribution == 'Ubuntu' and
-           (ansible_distribution_version is version('18.04', '==') or
-            ansible_distribution_version is version('20.04', '==')))
+    - (wal_g_installed_version.stderr is search("command not found") or wal_g_installed_version.stdout != wal_g_version)
+    - not (ansible_distribution == 'Ubuntu' and ansible_distribution_version == '20.04')
   tags: wal-g, wal_g, wal_g_install
 
 # older versions of WAL-G (for compatibility)
diff --git a/vars/Debian.yml b/vars/Debian.yml
index 3a3952945..e10e3e115 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -74,7 +74,6 @@ vip_manager_package_repo:
 haproxy_installation_method: "deb"  # (default)"deb" or "src"
 haproxy_install_repo: true  # or 'false'
 # for Debian 10 the haproxy version 1.8 (LTS) will be installed from the haproxy.debian.net repository.
-# for Ubuntu 18.04 the haproxy version 1.8 (LTS) will be installed from the ppa:vbernat/haproxy-1.8 repository.
 # you can preload the haproxy deb packages to your APT repository (in this case specify "haproxy_install_repo: false").
 confd_package_repo: "https://github.com/kelseyhightower/confd/releases/download/v0.16.0/confd-0.16.0-linux-amd64"
 
diff --git a/vars/main.yml b/vars/main.yml
index a4914597f..c170cf8c0 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -456,7 +456,7 @@ pg_probackup_patroni_cluster_bootstrap_command: "{{ pg_probackup_command_parts |
 
 # WAL-G
 wal_g_install: false  # or 'true'
-wal_g_version: "2.0.1"
+wal_g_version: "3.0.0"
 wal_g_json:  # config https://github.com/wal-g/wal-g#configuration
   - { option: "AWS_ACCESS_KEY_ID", value: "{{ AWS_ACCESS_KEY_ID | default('') }}" }  # define values or pass via --extra-vars
   - { option: "AWS_SECRET_ACCESS_KEY", value: "{{ AWS_SECRET_ACCESS_KEY | default('') }}" }  # define values or pass via --extra-vars