coreos/prometheus-operator
1
0
Fork 0
mirror of https://github.com/coreos/prometheus-operator.git synced 2026-02-05 15:46:31 +01:00
Code Issues Releases Wiki Activity

Merge pull request #1541 from brancz/cut-0.21.0

Browse Source 
Cut 0.21.0
This commit is contained in:
Frederic Branczyk
2018-06-28 12:42:55 +02:00
committed by GitHub
parent 73f277b39d ff20f263a3
commit 79fbe4641c
8 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -2,6 +2,14 @@
* [CHANGE] Deprecate specification of Prometheus rules via ConfigMaps in favor of `PrometheusRule` CRDs
## 0.21.0 / 2018-06-28
* [CHANGE] Default to Prometheus v2.3.1.
* [CHANGE] Default to Alertmanager v0.15.0.
* [FEATURE] Make remote write queue configurations configurable.
* [FEATURE] Add Thanos integration (experimental).
* [BUGFIX] Fix usage of console templates and libraries.
## 0.20.0 / 2018-06-05
With this release we introduce a new Custom Resource Definition - the

4
Documentation/user-guides/cluster-monitoring.md
View File

@@ -60,8 +60,8 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.20.0
image: quay.io/coreos/prometheus-operator:v0.20.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.21.0
image: quay.io/coreos/prometheus-operator:v0.21.0
name: prometheus-operator
ports:
- containerPort: 8080

2
VERSION
View File

@@ -1 +1 @@
0.20.0
0.21.0

10
contrib/kube-prometheus/jsonnetfile.json
View File

@@ -9,6 +9,16 @@
}
},
"version": "."
},
{
"name": "prometheus-operator",
"source": {
"git": {
"remote": "../../",
"subdir": "jsonnet/prometheus-operator"
}
},
"version": "."
}
]
}

4
contrib/kube-prometheus/manifests/0prometheus-operator-deployment.yaml
View File

@@ -19,8 +19,8 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.20.0
image: quay.io/coreos/prometheus-operator:v0.20.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.21.0
image: quay.io/coreos/prometheus-operator:v0.21.0
name: prometheus-operator
ports:
- containerPort: 8080

4
example/non-rbac/prometheus-operator.yaml
View File

@@ -19,8 +19,8 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.20.0
image: quay.io/coreos/prometheus-operator:v0.20.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.21.0
image: quay.io/coreos/prometheus-operator:v0.21.0
name: prometheus-operator
ports:
- containerPort: 8080

4
example/rbac/prometheus-operator/prometheus-operator-deployment.yaml
View File

@@ -19,8 +19,8 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.20.0
image: quay.io/coreos/prometheus-operator:v0.20.0
- --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.21.0
image: quay.io/coreos/prometheus-operator:v0.21.0
name: prometheus-operator
ports:
- containerPort: 8080

2
jsonnet/prometheus-operator/prometheus-operator.libsonnet
View File

@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
namespace: 'default',
versions+:: {
prometheusOperator: 'v0.20.0',
prometheusOperator: 'v0.21.0',
configmapReloader: 'v0.0.1',
},