mirrors/prometheus-operator
mirrors/prometheus-operator
1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-20 19:29:10 +00:00
Code Activity

*: Update to Proemtheus v2.5.0 as default

Browse source
This commit is contained in:
Matthias Loibl 2018-11-07 15:32:39 +01:00
parent 5e1bcc9df7
commit fa0a0ae33a
No known key found for this signature in database
GPG key ID: B1C7DF661ABB2C1A
4 changed files with 6 additions and 4 deletions
Documentation
compatibility.md
contrib/kube-prometheus/jsonnet/kube-prometheus/prometheus
prometheus.libsonnet
pkg/prometheus
statefulset.gostatefulset_test.go

1
Documentation/compatibility.md
View file

@ -39,3 +39,4 @@ The versions of Prometheus compatible to be run with the Prometheus Operator are
* v2.4.1
* v2.4.2
* v2.4.3
* v2.5.0

2
contrib/kube-prometheus/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View file

@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
namespace: 'default',
versions+:: {
prometheus: 'v2.4.3',
prometheus: 'v2.5.0',
},
imageRepos+:: {

3
pkg/prometheus/statefulset.go
View file

@ -34,7 +34,7 @@ import (
const (
governingServiceName = "prometheus-operated"
DefaultPrometheusVersion = "v2.4.3"
DefaultPrometheusVersion = "v2.5.0"
DefaultThanosVersion = "v0.1.0"
defaultRetention = "24h"
storageDir = "/prometheus"
@ -80,6 +80,7 @@ var (
"v2.4.1",
"v2.4.2",
"v2.4.3",
"v2.5.0",
}
)

4
pkg/prometheus/statefulset_test.go
View file

@ -529,8 +529,8 @@ func TestRetention(t *testing.T) {
}{
{"v1.8.2", "", "-storage.local.retention=24h"},
{"v1.8.2", "1d", "-storage.local.retention=1d"},
{"v2.4.3", "", "--storage.tsdb.retention=24h"},
{"v2.4.3", "1d", "--storage.tsdb.retention=1d"},
{"v2.5.0", "", "--storage.tsdb.retention=24h"},
{"v2.5.0", "1d", "--storage.tsdb.retention=1d"},
}
for _, test := range tests {