Skip to content

Commit

Permalink
Merge pull request #1262 from mxinden/cut-0.19.0
Browse files Browse the repository at this point in the history
Cut 0.19.0
  • Loading branch information
mxinden committed Apr 27, 2018
2 parents 7d4d937 + d7d5a7e commit 303ce71
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 8 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## 0.19.0 / 2018-04-25

* [FEATURE] Allow specifying additional Prometheus scrape configs via secret (#1246)
* [FEATURE] Enable Thanos sidecar (#1219)
* [FEATURE] Make AM log level configurable (#1192)
* [ENHANCEMENT] Enable Prometheus to select Service Monitors outside own namespace (#1227)
* [ENHANCEMENT] Enrich Prometheus operator CRD registration error handling (#1208)
* [BUGFIX] Allow up to 10m for Prometheus pod on startup for data recovery (#1232)

## 0.18.1 / 2018-04-09

* [BUGFIX] Fix alertmanager >=0.15.0 cluster gossip communication (#1193)
Expand Down
2 changes: 1 addition & 1 deletion Documentation/user-guides/cluster-monitoring.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
image: quay.io/coreos/prometheus-operator:v0.18.1
image: quay.io/coreos/prometheus-operator:v0.19.0
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion Documentation/user-guides/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
image: quay.io/coreos/prometheus-operator:v0.18.1
image: quay.io/coreos/prometheus-operator:v0.19.0
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.18.1
0.19.0
2 changes: 1 addition & 1 deletion bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
image: quay.io/coreos/prometheus-operator:v0.18.1
image: quay.io/coreos/prometheus-operator:v0.19.0
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local k = import "ksonnet.beta.3/k.libsonnet";

local version = "v0.18.1";
local version = "v0.19.0";

local deployment = k.apps.v1beta2.deployment;
local container = k.apps.v1beta2.deployment.mixin.spec.template.spec.containersType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
image: quay.io/coreos/prometheus-operator:v0.18.1
image: quay.io/coreos/prometheus-operator:v0.19.0
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion example/non-rbac/prometheus-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
image: quay.io/coreos/prometheus-operator:v0.18.1
image: quay.io/coreos/prometheus-operator:v0.19.0
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion example/rbac/prometheus-operator/prometheus-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
- args:
- --kubelet-service=kube-system/kubelet
- --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
image: quay.io/coreos/prometheus-operator:v0.18.1
image: quay.io/coreos/prometheus-operator:v0.19.0
name: prometheus-operator
ports:
- containerPort: 8080
Expand Down

0 comments on commit 303ce71

Please sign in to comment.