From 2bfdf4e7c9d620a4d1397ae5acbfaaff9ec95beb Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Wed, 13 Mar 2024 11:34:19 +0100 Subject: [PATCH] Bump proxysql to 2.6.x This patch bump proxysql 2.5.x to 2.6.x Change-Id: I26e6c04ad0ba15ad4aa90f95259dc41cad439e73 --- 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-9e646a32db57a451.yaml | 3 +++ 5 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/bump-proxysql-version-9e646a32db57a451.yaml diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst index 9b20b8b939..42ec7ef593 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.4.x `ProxySQL repository`_ + ProxySQL 2.6.x `ProxySQL repository`_ Rabbitmq 3.10.x - CentOS: `Team RabbitMQ 'PackageCloud' repository`_ - 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.5.x/ +.. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/ .. _`Team RabbitMQ 'Cloudsmith' repository`: 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 c680f458cb..84366669bf 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.5.x/repo_pub_key'}, + {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-2.6.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 4a20aeb3bb..91f45d9d49 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.5.x/almalinux/$releasever -gpgkey = https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/repo_pub_key +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 gpgcheck = 1 enabled = 0 diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 927e5c4058..1c7572b48e 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.5.x/bookworm/" + url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.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.5.x/bookworm/" + url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/bookworm/" suite: "./" component: "" gpg_key: "proxysql.asc" @@ -208,7 +208,7 @@ ubuntu: component: "main" gpg_key: "opensearch.asc" proxysql: - url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/jammy/" + url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/jammy/" suite: "./" component: "" gpg_key: "proxysql.asc" @@ -255,7 +255,7 @@ ubuntu-aarch64: component: "main" gpg_key: "opensearch.asc" proxysql: - url: "https://repo.proxysql.com/ProxySQL/proxysql-2.5.x/jammy/" + url: "https://repo.proxysql.com/ProxySQL/proxysql-2.6.x/jammy/" suite: "./" component: "" gpg_key: "proxysql.asc" diff --git a/releasenotes/notes/bump-proxysql-version-9e646a32db57a451.yaml b/releasenotes/notes/bump-proxysql-version-9e646a32db57a451.yaml new file mode 100644 index 0000000000..f8afb070cc --- /dev/null +++ b/releasenotes/notes/bump-proxysql-version-9e646a32db57a451.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - ProxySQL version was increased to 2.6.x