Synchronise master with upstream

kolla/common/sources.yaml

@@ -247,11 +247,11 @@ prometheus-memcached-exporter:
     arm64: "d1abf0ef1196ff5de5cf3462eb962b4a3d6733327951ae6d81c062902b5f2a60"
   location: "https://github.com/prometheus/memcached_exporter/releases/download/v${version}/memcached_exporter-${version}.linux-${debian_arch}.tar.gz"
 prometheus-mtail:
-  version: "3.4.13"
+  version: "3.4.14"
   type: "url"
   sha256:
-    amd64: "0817296e9609ed881f12eab1d93bac84e8aac2a156b6658a4ef86fa2fedf7b75"
-    arm64: "d52b2c00691aaed07e71c0f7d11a602f5bbaa2816d41f4493c6f43ea77749964"
+    amd64: "a01c7713d97c8725067e3f6cf2a5dccccb7aee62c8af57ffcff3a658f48b1b29"
+    arm64: "05c484b6a03510f8e6dfffccfe43453e71d357168c157342448e174f3263ca22"
   location: "https://github.com/jaqx0r/mtail/releases/download/v${version}/mtail_${version}_linux_${debian_arch}.tar.gz"
 prometheus-mysqld-exporter:
   version: "0.20.0"
@@ -292,11 +292,11 @@ prometheus-server:
     arm64: "aa9be9c36608e7ab7cc089726195d0e4fa74f87b330538df9d30d3da1f2b0e18"
   location: "https://github.com/prometheus/prometheus/releases/download/v${version}/prometheus-${version}.linux-${debian_arch}.tar.gz"
 prometheus-valkey-exporter:
-  version: "1.92.0"
+  version: "1.92.1"
   type: "url"
   sha256:
-    amd64: "028736b15004c1f5c25508235a361d80f1989c577a458cc0dc97279c5269f709"
-    arm64: "00ce9ba1fc0e6474e69d05e743e2b9b2ddeb89e35b23bf7c999a0667a737fd75"
+    amd64: "60e9819172ec1c954bad9b44ba0b15ef064e8551bd74461d0ed1a7585bb2c6ad"
+    arm64: "9aecfb030b173516266773e7d88256bedf414e6a552afc385cbb1ecd49f26832"
   location: "https://github.com/oliver006/redis_exporter/releases/download/v${version}/redis_exporter-v${version}.linux-${debian_arch}.tar.gz"
 skyline-apiserver:
   type: "url"

kolla/docker/ironic/ironic-conductor/Dockerfile.j2

@@ -25,7 +25,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
         'systemd-udev',
         'util-linux',
         'xfsprogs',
-        'xorriso'
+        'xorriso',
+        'zstd'
     ] %}
     {% if base_arch in ['x86_64'] %}
         {% set ironic_conductor_packages = ironic_conductor_packages + [
@@ -50,6 +51,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
         'shellinabox',
         'udev',
         'xfsprogs',
+        'zstd'
     ] %}
 {% endif %}
 

kolla/docker/mariadb-server/Dockerfile.j2

@@ -54,12 +54,10 @@ COPY mariadb_sudoers /etc/sudoers.d/kolla_mariadb_sudoers
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 COPY security_reset.expect /usr/local/bin/kolla_security_reset
 COPY backup.sh /usr/local/bin/kolla_mariadb_backup.sh
-COPY backup_replica.sh /usr/local/bin/kolla_mariadb_backup_replica.sh
 
 RUN chmod 644 /usr/local/bin/kolla_extend_start \
     && chmod 755 /usr/local/bin/kolla_security_reset \
                  /usr/local/bin/kolla_mariadb_backup.sh \
-                 /usr/local/bin/kolla_mariadb_backup_replica.sh \
     && chmod 750 /etc/sudoers.d \
     && chmod 440 /etc/sudoers.d/kolla_mariadb_sudoers \
     && rm -rf /var/lib/mysql/*

kolla/docker/ovn/ovn-sb-db-relay/Dockerfile.j2

@@ -7,12 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
 
 {% import "macros.j2" as macros with context %}
 
-{% block ovn_sb_db_relay_ovn_ctl %}
-{# TODO(mnasiadka): Switch to 25.03 branch when available, ideally rpm/deb packages will be
-                    available. #}
-RUN curl -o /usr/share/ovn/scripts/ovn-ctl https://raw.githubusercontent.com/ovn-org/ovn/refs/heads/main/utilities/ovn-ctl
-{% endblock %}
-
 COPY extend_start.sh /usr/local/bin/kolla_ovn_extend_start
 RUN chmod 644 /usr/local/bin/kolla_ovn_extend_start
 

releasenotes/notes/bug-2167459-3dbfafe10ea28fdc.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes ironic-conductor failing to decompress zstd
+    compressed files. `LP#2167459 <https://launchpad.net/bugs/2167459>_`

releasenotes/notes/update-external-components-419631c0a728a61e.yaml

@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    ``prometheus-mtail`` has been updated from ``3.4.13`` to ``3.4.14``.
+  - |
+    ``prometheus-valkey-exporter`` has been updated from ``1.92.0`` to
+    ``1.92.1``.

roles/kolla-build-config/templates/kolla-build.conf.j2

@@ -10,7 +10,6 @@
 {# Generate a section for every build source Zuul has a checkout for,
    whether it's a required-project or a Depends-On. #}
 
-{% if not (is_upgrade | default(False) | bool) %}
 {% for canonical_name, project in zuul['projects'].items() %}
 {% if project.name in kolla_build_sources %}
 {% set source_names = kolla_build_sources[project.name] %}
@@ -27,4 +26,3 @@ location = {{ ansible_env.PWD ~ '/' ~ project.src_dir }}
 {% endif %}
 {% endif %}
 {% endfor %}
-{% endif %}