From dc5b404711c43ac38201073f9ce327c7f9b71f1b Mon Sep 17 00:00:00 2001 From: Roger Luethi Date: Sat, 4 Jul 2026 16:09:48 +0200 Subject: [PATCH] kolla: gate prometheus image by release prometheus_server_image gated the modern 'prometheus-server' name behind an exact allowlist (openstack_version in ['2025.1']) and fell back to the legacy 'prometheus-v2-server' otherwise. Kolla renamed the image at 2025.1 (Prometheus 2.x -> 3.x) and only builds 'prometheus-v2-server' for 2024.1 and 2024.2, so any release newer than 2025.1 not explicitly added to the list silently resolved to an image that is never built. 2025.2 deploys and upgrades failed pulling kolla/prometheus-v2-server:2025.2 (404) in the monitoring stage. Invert the gate to a legacy denylist: list the two releases that actually build 'prometheus-v2-server' (2024.1, 2024.2) and default to 'prometheus-server' for everything else. 2025.2, master, and all future releases now resolve correctly with no list maintenance, matching the forward-safe shape already used for redis/valkey/proxysql gating. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Roger Luethi --- all/002-images-kolla.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/all/002-images-kolla.yml b/all/002-images-kolla.yml index bdc54e6..1e43d53 100644 --- a/all/002-images-kolla.yml +++ b/all/002-images-kolla.yml @@ -319,7 +319,7 @@ glance_tls_proxy_tag: "{{ glance_tag }}" # role: prometheus prometheus_tag: "{{ kolla_prometheus_version|default(kolla_image_version) }}" -prometheus_server_image: "{{ docker_image_url }}{{ 'prometheus-server' if openstack_version in ['2025.1'] else 'prometheus-v2-server' }}" +prometheus_server_image: "{{ docker_image_url }}{{ 'prometheus-v2-server' if openstack_version in ['2024.1', '2024.2'] else 'prometheus-server' }}" prometheus_server_tag: "{{ prometheus_tag }}" prometheus_haproxy_exporter_image: "{{ docker_image_url }}prometheus-haproxy-exporter" prometheus_haproxy_exporter_tag: "{{ kolla_prometheus_haproxy_exporter_version|default(prometheus_tag) }}"