Skip to content

Commit

Permalink
Bump prometheus to v2.48.0 (#11633)
Browse files Browse the repository at this point in the history
* Bump prometheus to v2.48.0

This gets rids of most CVEs:

```bash
$ grype -q prom/prometheus:v2.47.0
NAME                                                           INSTALLED             FIXED-IN  TYPE       VULNERABILITY        SEVERITY
github.com/docker/docker                                       v24.0.4+incompatible  24.0.7    go-module  GHSA-jq35-85cj-fj4p  Medium
github.com/prometheus/alertmanager                             v0.25.0               0.25.1    go-module  GHSA-v86x-5fm3-5p7j  Medium
github.com/prometheus/alertmanager                             v0.25.0                         go-module  CVE-2023-40577       Medium
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp  v0.42.0               0.44.0    go-module  GHSA-rcjv-mgp8-qvmr  High
golang.org/x/net                                               v0.12.0               0.17.0    go-module  GHSA-4374-p667-p6c8  High
golang.org/x/net                                               v0.12.0               0.17.0    go-module  GHSA-qppj-fm5r-hxr3  Medium
golang.org/x/net                                               v0.12.0               0.13.0    go-module  GHSA-2wrh-6pvc-2jm9  Medium
google.golang.org/grpc                                         v1.56.2               1.56.3    go-module  GHSA-m425-mq94-257g  High
google.golang.org/grpc                                         v1.56.2               1.56.3    go-module  GHSA-qppj-fm5r-hxr3  Medium

$ grype -q prom/prometheus:v2.48.0
NAME                      INSTALLED             FIXED-IN  TYPE       VULNERABILITY        SEVERITY
github.com/docker/docker  v24.0.6+incompatible  24.0.7    go-module  GHSA-jq35-85cj-fj4p  Medium
```
  • Loading branch information
alpeb authored and olix0r committed Dec 7, 2023
1 parent 6a07e2c commit e294c78
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion viz/charts/linkerd-viz/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ Kubernetes: `>=1.21.0-0`
| prometheus.image.name | string | `"prometheus"` | Docker image name for the prometheus instance |
| prometheus.image.pullPolicy | string | defaultImagePullPolicy | Pull policy for the prometheus instance |
| prometheus.image.registry | string | `"prom"` | Docker registry for the prometheus instance |
| prometheus.image.tag | string | `"v2.47.0"` | Docker image tag for the prometheus instance |
| prometheus.image.tag | string | `"v2.48.0"` | Docker image tag for the prometheus instance |
| prometheus.logFormat | string | defaultLogLevel | log format (plain, json) of the prometheus instance |
| prometheus.logLevel | string | defaultLogLevel | log level of the prometheus instance |
| prometheus.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | NodeSelector section, See the [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information |
Expand Down
2 changes: 1 addition & 1 deletion viz/charts/linkerd-viz/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ prometheus:
# -- Docker image name for the prometheus instance
name: prometheus
# -- Docker image tag for the prometheus instance
tag: v2.47.0
tag: v2.48.0
# -- Pull policy for the prometheus instance
# @default -- defaultImagePullPolicy
pullPolicy: ""
Expand Down
2 changes: 1 addition & 1 deletion viz/cmd/testdata/install_default.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion viz/cmd/testdata/install_default_overrides.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion viz/cmd/testdata/install_proxy_resources.golden

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e294c78

Please sign in to comment.