aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-05-18 12:03:35 +0000
committerGerrit Code Review <review@openstack.org>2023-05-18 12:03:35 +0000
commit704d521d625ea74336226014c3b5d9b1cf597ac2 (patch)
treed3c6af15da24f38c1935070dde6a86d6c2ef9a38
parentc4ee8d88feecca90d34adc10af0c6fc8a213e086 (diff)
parent9e4418445642b091f27feb2d8849a95605cc56b7 (diff)
downloadkolla-704d521d625ea74336226014c3b5d9b1cf597ac2.tar.gz
kolla-704d521d625ea74336226014c3b5d9b1cf597ac2.zip
Merge "prometheus: update ovn-exporter version to 1.0.6"
-rw-r--r--docker/prometheus/prometheus-ovn-exporter/Dockerfile.j216
-rw-r--r--releasenotes/notes/update-ovn-exporter-ab80a3e88e617bdd.yaml4
2 files changed, 12 insertions, 8 deletions
diff --git a/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2 b/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2
index 6bcdd5726..1c705dd99 100644
--- a/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2
+++ b/docker/prometheus/prometheus-ovn-exporter/Dockerfile.j2
@@ -7,22 +7,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block prometheus_ovn_exporter_repository_version %}
-{% if debian_arch == 'amd64' %}
-ARG ovn_arch=x86_64
-{% else %}
-ARG ovn_arch={{ debian_arch }}
+{% if base_arch == 'x86_64' %}
+ARG ovn_arch=amd64
+{% elif base_arch == 'aarch64' %}
+ARG ovn_arch=arm64
{% endif %}
-ARG prometheus_ovn_version=1.0.4
+ARG prometheus_ovn_version=1.0.6
ARG prometheus_ovn_cksum_url=https://github.com/greenpau/ovn_exporter/releases/download/v${prometheus_ovn_version}/checksums.txt
-ARG ovn_exporter_tgz=ovn_exporter_${prometheus_ovn_version}_Linux_${ovn_arch}.tar.gz
+ARG ovn_exporter_tgz=ovn-exporter_${prometheus_ovn_version}_linux_${ovn_arch}.tar.gz
ARG prometheus_ovn_url=https://github.com/greenpau/ovn_exporter/releases/download/v${prometheus_ovn_version}/${ovn_exporter_tgz}
{% endblock %}
{% block prometheus_ovn_exporter_install %}
-RUN curl -o /tmp/${ovn_exporter_tgz} ${prometheus_ovn_url} \
- && curl -o /tmp/checksums.txt ${prometheus_ovn_cksum_url} \
+RUN curl -Lo /tmp/${ovn_exporter_tgz} ${prometheus_ovn_url} \
+ && curl -Lo /tmp/checksums.txt ${prometheus_ovn_cksum_url} \
&& cd /tmp \
&& sha256sum --ignore-missing -c /tmp/checksums.txt \
&& tar xvf /tmp/${ovn_exporter_tgz} -C /opt/ \
diff --git a/releasenotes/notes/update-ovn-exporter-ab80a3e88e617bdd.yaml b/releasenotes/notes/update-ovn-exporter-ab80a3e88e617bdd.yaml
new file mode 100644
index 000000000..5c63f3426
--- /dev/null
+++ b/releasenotes/notes/update-ovn-exporter-ab80a3e88e617bdd.yaml
@@ -0,0 +1,4 @@
+---
+features:
+ - |
+ ovn-expoter has been updated to version 1.0.6