From 046ad524eb579827ca756e371dc935eabdddebc7 Mon Sep 17 00:00:00 2001
From: Michal Arbet <michal.arbet@ultimum.io>
Date: Thu, 19 Sep 2024 10:27:55 +0200
Subject: [PATCH] Bump proxysql to 2.7.x

This patch bump proxysql 2.6.x to 2.7.x

Change-Id: I6e726d8ebf9dbc6d019dd72d6d0be9d9957a3f22
---
 doc/source/contributor/versions.rst                       | 4 ++--
 docker/base/Dockerfile.j2                                 | 2 +-
 docker/base/proxysql.repo                                 | 4 ++--
 kolla/template/repos.yaml                                 | 8 ++++----
 .../notes/bump-proxysql-version-aa1fb531f2b8f08a.yaml     | 3 +++
 5 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/bump-proxysql-version-aa1fb531f2b8f08a.yaml

diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst
index 98767e20be..2c21118b14 100644
--- a/doc/source/contributor/versions.rst
+++ b/doc/source/contributor/versions.rst
@@ -22,7 +22,7 @@ information about package sources.
  MariaDB        10.11 (LTS)        `MariaDB Community downloads`_
  Galera         26.4 (LTS)         `MariaDB Community downloads`_
  OpenSearch     2.x                `OpenSearch install guide`_
- ProxySQL       2.6.x              `ProxySQL repository`_
+ ProxySQL       2.7.x              `ProxySQL repository`_
  Rabbitmq       3.13.x             - CentOS/Rocky:
                                      `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
@@ -42,7 +42,7 @@ information about package sources.
 .. _`Kibana install guide`: https://www.elastic.co/guide/en/kibana/7.10/install.html
 .. _`Logstash install guide`: https://www.elastic.co/guide/en/logstash/7.9/installing-logstash.html
 .. _`TreasureData install guide`: https://www.fluentd.org/download
-.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/
+.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/
 
 .. _`Team RabbitMQ 'Cloudsmith' repo (Deb)`: https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
 .. _`Team RabbitMQ 'Modern Erlang' PPA`: https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index f37a6c8665..83d6add4fe 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -306,7 +306,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
    {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
    {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
    {'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch.pgp'},
-   {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/repo_pub_key'},
+   {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/repo_pub_key'},
    {'name': 'treasuredata', 'url': 'https://packages.treasuredata.com/GPG-KEY-td-agent'},
 ] %}
 
diff --git a/docker/base/proxysql.repo b/docker/base/proxysql.repo
index 91f45d9d49..938f565219 100644
--- a/docker/base/proxysql.repo
+++ b/docker/base/proxysql.repo
@@ -1,6 +1,6 @@
 [proxysql]
 name = ProxySQL
-baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/almalinux/$releasever
-gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/repo_pub_key
+baseurl = https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/almalinux/$releasever
+gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/repo_pub_key
 gpgcheck = 1
 enabled = 0
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 78d789a9e5..846c396c66 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -75,7 +75,7 @@ debian:
     component: "main"
     gpg_key: "opensearch.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/bookworm/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/bookworm/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
@@ -122,7 +122,7 @@ debian-aarch64:
     component: "main"
     gpg_key: "opensearch.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/bookworm/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/bookworm/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
@@ -209,7 +209,7 @@ ubuntu:
     component: "main"
     gpg_key: "opensearch.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/noble/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/noble/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
@@ -257,7 +257,7 @@ ubuntu-aarch64:
     component: "main"
     gpg_key: "opensearch.asc"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/noble/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-2.7.x/noble/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
diff --git a/releasenotes/notes/bump-proxysql-version-aa1fb531f2b8f08a.yaml b/releasenotes/notes/bump-proxysql-version-aa1fb531f2b8f08a.yaml
new file mode 100644
index 0000000000..fae10bb4a2
--- /dev/null
+++ b/releasenotes/notes/bump-proxysql-version-aa1fb531f2b8f08a.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Upgraded ProxySQL to version ``2.7.x``.