aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Szumski <doug@stackhpc.com>2026-04-17 14:33:23 +0100
committerDoug Szumski <doug@stackhpc.com>2026-04-24 15:27:01 +0000
commitb6a69915755b0447cacda5686aacd5bfc9d6440b (patch)
tree04d4e08492bf2a265cc8803b7f6d7b020ffa6033
parent4a7e5ee0dd0fe3ea31a3e6d59a51fe0ca72bda2c (diff)
downloadkolla-b6a69915755b0447cacda5686aacd5bfc9d6440b.tar.gz
kolla-b6a69915755b0447cacda5686aacd5bfc9d6440b.zip
Switch to binary release of OpenStack Network exporter
We no longer need to build this from source: aharivel has kindly responded to our request to create a release: https://github.com/openstack-k8s-operators/openstack-network-exporter/releases Needed-By: I35b3bb10aec18a9377515e8c04d2542e712c0f12 Change-Id: Id30cab4e4bbac470f33354870fd941c3ea17815c Signed-off-by: Doug Szumski <doug@stackhpc.com>
-rw-r--r--docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j237
-rw-r--r--kolla/common/sources.py9
-rw-r--r--zuul.d/scenarios/ovn.yaml6
3 files changed, 18 insertions, 34 deletions
diff --git a/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2
index 389f7c618..585b96423 100644
--- a/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2
+++ b/docker/prometheus/prometheus-openstack-network-exporter/Dockerfile.j2
@@ -1,39 +1,18 @@
-FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} AS build-stage
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-
- {% set prometheus_openstack_network_exporter_build_packages = [
- 'golang',
- 'make',
- ] %}
-
-{% elif base_package_type == 'deb' %}
-
- {% set prometheus_openstack_network_exporter_build_packages = [
- 'golang',
- 'make',
- ] %}
-
-{% endif %}
-
-{{ macros.install_packages(prometheus_openstack_network_exporter_build_packages | customizable("packages")) }}
-
-ADD prometheus-openstack-network-exporter-archive /
-
-RUN cd openstack-network-exporter* && make
-
-FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }} AS final-stage
+FROM {{ namespace }}/{{ image_prefix }}prometheus-base:{{ tag }}
{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}
{% block prometheus_openstack_network_exporter_header %}{% endblock %}
+{% import "macros.j2" as macros with context %}
+
{% block prometheus_openstack_network_exporter_install %}
-RUN mkdir /opt/openstack-network-exporter
-COPY --from=build-stage /openstack-network-exporter*/dataplane-node-exporter /opt/openstack-network-exporter/
+ADD prometheus-openstack-network-exporter-archive /prometheus-openstack-network-exporter-source
+
+RUN mkdir /opt/openstack-network-exporter \
+ && cp /prometheus-openstack-network-exporter-source /opt/openstack-network-exporter/openstack-network-exporter \
+ && chmod 0755 /opt/openstack-network-exporter/openstack-network-exporter
{% endblock %}
{{ macros.kolla_patch_sources() }}
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index 9e2e53874..7a815c569 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -385,11 +385,16 @@ SOURCES = {
'openstack-exporter'
'_${version}_linux_${debian_arch}.tar.gz')},
'prometheus-openstack-network-exporter': {
- 'version': '0.0.2',
+ 'version': '0.2.0',
'type': 'url',
+ 'sha256': {
+ 'amd64': 'c93e6c62a0b861af50292f51b1443114e2178d89450b37cb0462723eaa3b2338', # noqa: E501
+ 'arm64': '478de6e005188d0e2545e34ca2c5b93a33a32dc7d1f1b03dc3210c4ef7e44305'}, # noqa: E501
'location': ('https://github.com/'
'openstack-k8s-operators/openstack-network-exporter/'
- 'archive/v${version}.tar.gz')},
+ 'releases/download/v${version}/'
+ 'openstack-network-exporter'
+ '-linux-${debian_arch}')},
'prometheus-server': {
'version': '3.5.1',
'type': 'url',
diff --git a/zuul.d/scenarios/ovn.yaml b/zuul.d/scenarios/ovn.yaml
index 7d92bc60a..1bd5e7e1e 100644
--- a/zuul.d/scenarios/ovn.yaml
+++ b/zuul.d/scenarios/ovn.yaml
@@ -6,8 +6,8 @@
check:
jobs:
- kolla-ansible-debian-trixie-ovn:
- files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
+ files: ^docker/(base|neutron|openstack-base|openvswitch|ovn|prometheus/prometheus-openstack-network-exporter)/
- kolla-ansible-rocky-10-ovn:
- files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
+ files: ^docker/(base|neutron|openstack-base|openvswitch|ovn|prometheus/prometheus-openstack-network-exporter)/
- kolla-ansible-ubuntu-noble-ovn:
- files: ^docker/(base|neutron|openstack-base|openvswitch|ovn)/
+ files: ^docker/(base|neutron|openstack-base|openvswitch|ovn|prometheus/prometheus-openstack-network-exporter)/