Skip to content

Commit

Permalink
Bump cadvisor version to the latest version: v0.49.1 (#458)
Browse files Browse the repository at this point in the history
## Overview

- See the cadvisor repo for all changes:
google/cadvisor@v0.36.0...v0.49.1
- This updated was prompted by the fact that the previously installed
version of cadvisor (v0.36.0) did not support
newer versions of docker. When deploying this repo with recent docker
version, cadvisor was unable to discover or
    monitor running containers.

## Changes

**Non-breaking changes**
- New component version cadvisor:v0.49.1

**Breaking changes**

## Related Issue / Discussion

## Additional Information

Links to other issues or sources.

- This PR builds on top of #457

## CI Operations

<!--
The test suite can be run using a different DACCS config with
``birdhouse_daccs_configs_branch: branch_name`` in the PR description.
To globally skip the test suite regardless of the commit message use
``birdhouse_skip_ci`` set to ``true`` in the PR description.
Note that using ``[skip ci]``, ``[ci skip]`` or ``[no ci]`` in the
commit message will override ``birdhouse_skip_ci`` from the PR
description.
-->

birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false
  • Loading branch information
mishaschwartz authored May 29, 2024
2 parents cca82f5 + e502d12 commit 5f88666
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.3.2
current_version = 2.3.3
commit = True
tag = False
tag_name = {new_version}
Expand Down Expand Up @@ -30,11 +30,11 @@ search = {current_version}
replace = {new_version}

[bumpversion:file:RELEASE.txt]
search = {current_version} 2024-05-27T13:26:27Z
search = {current_version} 2024-05-29T12:13:00Z
replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}

[bumpversion:part:releaseTime]
values = 2024-05-27T13:26:27Z
values = 2024-05-29T12:13:00Z

[bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
search = 'version': '{current_version}'
Expand Down
11 changes: 11 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@

[//]: # (list changes here, using '-' for each new entry, remove this when items are added)

[2.3.3](https://github.com/bird-house/birdhouse-deploy/tree/2.3.3) (2024-05-29)
------------------------------------------------------------------------------------------------------------------

## Changes

- Bump cadvisor version to the latest version: v0.49.1
- See the cadvisor repo for all changes: https://github.com/google/cadvisor/compare/v0.36.0...v0.49.1
- This updated was prompted by the fact that the previously installed version of cadvisor (v0.36.0) did not support
newer versions of docker. When deploying this repo with recent docker version, cadvisor was unable to discover or
monitor running containers.

[2.3.2](https://github.com/bird-house/birdhouse-deploy/tree/2.3.2) (2024-05-27)
------------------------------------------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generic variables
override SHELL := bash
override APP_NAME := birdhouse-deploy
override APP_VERSION := 2.3.2
override APP_VERSION := 2.3.3

# utility to remove comments after value of an option variable
override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ for a full-fledged production platform.
* - citation
- | |citation|

.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.3.2.svg
.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.3.3.svg
:alt: Commits since latest release
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.3.2...master
:target: https://github.com/bird-house/birdhouse-deploy/compare/2.3.3...master

.. |latest-version| image:: https://img.shields.io/badge/tag-2.3.2-blue.svg?style=flat
.. |latest-version| image:: https://img.shields.io/badge/tag-2.3.3-blue.svg?style=flat
:alt: Latest Tag
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.3.2
:target: https://github.com/bird-house/birdhouse-deploy/tree/2.3.3

.. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
:alt: ReadTheDocs Build Status (latest version)
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.3.2 2024-05-27T13:26:27Z
2.3.3 2024-05-29T12:13:00Z
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ SERVICES = {
# NOTE:
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
'version': '2.3.2',
'releaseTime': '2024-05-27T13:26:27Z',
'version': '2.3.3',
'releaseTime': '2024-05-29T12:13:00Z',
'institution': '${SERVER_INSTITUTION}',
'researchSubject': '${SERVER_SUBJECT}',
'supportEmail': '${SUPPORT_EMAIL}',
Expand Down Expand Up @@ -141,8 +141,8 @@ PLATFORMS = {
# NOTE:
# Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
# Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
'version': '2.3.2',
'releaseTime': '2024-05-27T13:26:27Z',
'version': '2.3.3',
'releaseTime': '2024-05-29T12:13:00Z',
'institution': '${SERVER_INSTITUTION}',
'researchSubject': '${SERVER_SUBJECT}',
'supportEmail': '${SUPPORT_EMAIL}',
Expand Down
4 changes: 2 additions & 2 deletions birdhouse/components/monitoring/default.env
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ export PROMETHEUS_VERSION="v2.19.0"
export PROMETHEUS_DOCKER=prom/prometheus
export PROMETHEUS_IMAGE='${PROMETHEUS_DOCKER}:${PROMETHEUS_VERSION}'

export CADVISOR_VERSION="v0.36.0"
export CADVISOR_DOCKER="gcr.io/google-containers/cadvisor"
export CADVISOR_VERSION="v0.49.1"
export CADVISOR_DOCKER="gcr.io/cadvisor/cadvisor"
export CADVISOR_IMAGE='${CADVISOR_DOCKER}:${CADVISOR_VERSION}'

export NODE_EXPORTER_VERSION="v1.0.0"
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
# built documents.
#
# The short X.Y version.
version = '2.3.2'
version = '2.3.3'
# The full version, including alpha/beta/rc tags.
release = '2.3.2'
release = '2.3.3'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 5f88666

Please sign in to comment.