diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-24 20:19:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-24 20:19:28 +0000 |
| commit | 7a57a4230a496250725ae6cd6012eea2a12fe799 (patch) | |
| tree | df8323f46f4fb1f92ce3f9db17b8709ee96a6841 /docker | |
| parent | db212f92d6f149544d5b2b9c0e88c6b43ff7bcc8 (diff) | |
| parent | b534c2219f3913e33d431a54001fd2ce87b0bd98 (diff) | |
| download | kolla-7a57a4230a496250725ae6cd6012eea2a12fe799.tar.gz kolla-7a57a4230a496250725ae6cd6012eea2a12fe799.zip | |
Merge "Update cAdvisor to latest release"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/prometheus/prometheus-cadvisor/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/prometheus/prometheus-cadvisor/releasenotes/notes/upgrade-cadvisor-13704412132e390b.yaml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 index 05c13f46e..eeb87f5c4 100644 --- a/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 +++ b/docker/prometheus/prometheus-cadvisor/Dockerfile.j2 @@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} {% block prometheus_cadvisor_repository_version %} -ENV prometheus_cadvisor_version=0.32.0 +ENV prometheus_cadvisor_version=0.35.0 {% endblock %} {% if base_arch in ['x86_64'] %} diff --git a/docker/prometheus/prometheus-cadvisor/releasenotes/notes/upgrade-cadvisor-13704412132e390b.yaml b/docker/prometheus/prometheus-cadvisor/releasenotes/notes/upgrade-cadvisor-13704412132e390b.yaml new file mode 100644 index 000000000..b8ee96472 --- /dev/null +++ b/docker/prometheus/prometheus-cadvisor/releasenotes/notes/upgrade-cadvisor-13704412132e390b.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + Upgrades cAdvisor from the 0.32 release to the 0.35 release for x86 arch. |