Skip to content

Commit

Permalink
chore: bump Prometheus, Alertmanager, Thanos versions
Browse files Browse the repository at this point in the history
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
  • Loading branch information
simonpasquier committed Jan 5, 2023
1 parent 9f48d7b commit 482937c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
10 changes: 7 additions & 3 deletions Documentation/compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ The versions of Prometheus compatible with the Prometheus Operator are:
* v2.37.2
* v2.37.3
* v2.37.4
* v2.37.5
* v2.38.0
* v2.39.0
* v2.39.1
Expand All @@ -111,12 +112,15 @@ The versions of Prometheus compatible with the Prometheus Operator are:
* v2.40.3
* v2.40.4
* v2.40.5
* v2.40.6
* v2.40.7
* v2.41.0
```

The end-to-end tests are mostly tested against

```$ mdox-exec="go run ./cmd/po-docgen/. compatibility defaultPrometheusVersion"
* v2.40.5
* v2.41.0
```

## Alertmanager
Expand All @@ -126,7 +130,7 @@ The Prometheus Operator is compatible with Alertmanager v0.15 and above.
The end-to-end tests are mostly tested against

```$ mdox-exec="go run ./cmd/po-docgen/. compatibility defaultAlertmanagerVersion"
* v0.24.0
* v0.25.0
```

## Thanos
Expand All @@ -136,5 +140,5 @@ The Prometheus Operator is compatible with Thanos v0.10 and above.
The end-to-end tests are mostly tested against

```$ mdox-exec="go run ./cmd/po-docgen/. compatibility defaultThanosVersion"
* v0.29.0
* v0.30.1
```
8 changes: 6 additions & 2 deletions pkg/operator/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ import "github.com/prometheus/common/version"

const (
// DefaultAlertmanagerVersion is a default image tag for the prometheus alertmanager
DefaultAlertmanagerVersion = "v0.24.0"
DefaultAlertmanagerVersion = "v0.25.0"
// DefaultAlertmanagerBaseImage is a base container registry address for the prometheus alertmanager
DefaultAlertmanagerBaseImage = "quay.io/prometheus/alertmanager"
// DefaultAlertmanagerImage is a default image pulling address for the prometheus alertmanager
DefaultAlertmanagerImage = DefaultAlertmanagerBaseImage + ":" + DefaultAlertmanagerVersion

// DefaultThanosVersion is a default image tag for the Thanos long-term prometheus storage collector
DefaultThanosVersion = "v0.29.0"
DefaultThanosVersion = "v0.30.1"
// DefaultThanosBaseImage is a base container registry address for the Thanos long-term prometheus
// storage collector
DefaultThanosBaseImage = "quay.io/thanos/thanos"
Expand Down Expand Up @@ -118,6 +118,7 @@ var (
"v2.37.2",
"v2.37.3",
"v2.37.4",
"v2.37.5",
"v2.38.0",
"v2.39.0",
"v2.39.1",
Expand All @@ -128,5 +129,8 @@ var (
"v2.40.3",
"v2.40.4",
"v2.40.5",
"v2.40.6",
"v2.40.7",
"v2.41.0",
}
)

0 comments on commit 482937c

Please sign in to comment.