From a045bd7288bcb03b2c08bc9ace4e224e2ebee5d5 Mon Sep 17 00:00:00 2001
From: Michael Still <mikal@stillhq.com>
Date: Wed, 7 Jan 2026 20:55:56 +1100
Subject: [PATCH] Update repo GPG key for influxdata.

According to https://www.influxdata.com/blog/package-signing-key-rotation
the preferred signing key for influxdata package repositories
changed in early 2026. Update to the new preferred key.

Closes-Bug: #2138095

Change-Id: I77d38e713678ea653ded3b14fd0541d3ec0ebee6
Signed-off-by: Michael Still <mikal@stillhq.com>
(cherry picked from commit b852b8ce32a53cd747d8385e6185d2ad521dee5d)
---
 docker/base/Dockerfile.j2                                   | 2 +-
 kolla/template/repos.yaml                                   | 2 +-
 .../notes/influxdb-repo-gpg-key-04eb924f249e54a5.yaml       | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/influxdb-repo-gpg-key-04eb924f249e54a5.yaml

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 5ba1d5a874..20ad0f5389 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -247,7 +247,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
    {'name': 'docker-ce', 'url': 'https://download.docker.com/linux/debian/gpg'},
    {'name': 'fluentd', 'url': 'https://fluentd.cdn.cncf.io/GPG-KEY-fluent-package'},
    {'name': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'},
-   {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive_compat.key'},
+   {'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdata-archive.key'},
    {'name': 'mariadb', 'url': 'https://downloads.mariadb.com/MariaDB/mariadb-keyring-2019.gpg', 'type': 'gpg'},
    {'name': 'opensearch', 'url': 'https://artifacts.opensearch.org/publickeys/opensearch-release.pgp'},
    {'name': 'proxysql', 'url': 'https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key'},
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 7d9d7ec71a..b5437ce93d 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -146,7 +146,7 @@ rpm:
     distro: true
   influxdb:
     baseurl: "https://repos.influxdata.com/rhel/9/$basearch/stable"
-    gpgkey: "https://repos.influxdata.com/influxdata-archive_compat.key"
+    gpgkey: "https://repos.influxdata.com/influxdata-archive.key"
     name: "influxdb"
   kolla_el10:
     baseurl: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/epel-10-$basearch/"
diff --git a/releasenotes/notes/influxdb-repo-gpg-key-04eb924f249e54a5.yaml b/releasenotes/notes/influxdb-repo-gpg-key-04eb924f249e54a5.yaml
new file mode 100644
index 0000000000..07b865f2cd
--- /dev/null
+++ b/releasenotes/notes/influxdb-repo-gpg-key-04eb924f249e54a5.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Updates the InfluxDB repository GPG key from the expired
+    ``influxdata-archive_compat.key`` to the recommended
+    ``influxdata-archive.key`` as per https://repos.influxdata.com.