Skip to content

[release/1.6 backport] Update prometheus client vendor#6732

Merged
kzys merged 3 commits intocontainerd:release/1.6from
thaJeztah:1.6_backport_update_prom_dep
Mar 24, 2022
Merged

[release/1.6 backport] Update prometheus client vendor#6732
kzys merged 3 commits intocontainerd:release/1.6from
thaJeztah:1.6_backport_update_prom_dep

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Mar 24, 2022

backport of #6690

Update to the recent release (includes a CVE fix) of the Go prom client library

estesp added 3 commits March 24, 2022 03:24
Signed-off-by: Phil Estes <[email protected]>
(cherry picked from commit c568752)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
The linter on platforms that have a hardcoded response complains about
"if xyz == nil" checks; ignore those.

Signed-off-by: Phil Estes <[email protected]>
(cherry picked from commit ee49c4d)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Phil Estes <[email protected]>
(cherry picked from commit 56f95e3)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Copy Markdown
Member

@kzys kzys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kzys kzys merged commit bee6992 into containerd:release/1.6 Mar 24, 2022
@thaJeztah thaJeztah deleted the 1.6_backport_update_prom_dep branch March 24, 2022 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants