diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-27 18:52:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-27 18:52:29 +0000 |
| commit | afa230ace202ee952f1fa26c886c10744c01848e (patch) | |
| tree | 17141355aa8d3ffdd5f6ab0990fc343be0e22616 | |
| parent | 6800d22137bf52e1ef756d05eac2ee79ce2e9910 (diff) | |
| parent | e8e8e5296e0cdbb5a5e11fec15ba9773ebfedab6 (diff) | |
| download | kolla-afa230ace202ee952f1fa26c886c10744c01848e.tar.gz kolla-afa230ace202ee952f1fa26c886c10744c01848e.zip | |
Merge "Remove Prometheus v1 image"
| -rw-r--r-- | docker/prometheus/prometheus-server/Dockerfile.j2 | 23 | ||||
| -rw-r--r-- | releasenotes/notes/remove-prometheus-v1-3bc458bed2228a9e.yaml | 4 |
2 files changed, 4 insertions, 23 deletions
diff --git a/docker/prometheus/prometheus-server/Dockerfile.j2 b/docker/prometheus/prometheus-server/Dockerfile.j2 deleted file mode 100644 index e01fe2d7a..000000000 --- a/docker/prometheus/prometheus-server/Dockerfile.j2 +++ /dev/null @@ -1,23 +0,0 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}prometheus-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block prometheus_server_header %}{% endblock %} - -{% block prometheus_server_repository_version %} -ENV prometheus_version=1.8.2 -{% endblock %} - -{% block prometheus_server_install %} -RUN curl -o /tmp/prometheus.tar.gz https://github.com/prometheus/prometheus/releases/download/v${prometheus_version}/prometheus-${prometheus_version}.linux-{{debian_arch}}.tar.gz \ - && tar xvf /tmp/prometheus.tar.gz -C /opt/ \ - && rm -f /tmp/prometheus.tar.gz \ - && ln -s /opt/prometheus* /opt/prometheus \ - && mkdir -p /etc/prometheus /data -{% endblock %} - -{% block prometheus_server_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER prometheus diff --git a/releasenotes/notes/remove-prometheus-v1-3bc458bed2228a9e.yaml b/releasenotes/notes/remove-prometheus-v1-3bc458bed2228a9e.yaml new file mode 100644 index 000000000..a3d57bbae --- /dev/null +++ b/releasenotes/notes/remove-prometheus-v1-3bc458bed2228a9e.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Prometheus v1 image has been removed. |