diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2027329f5..2b3e6d273 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
* [CHANGE] Deprecate specification of Prometheus rules via ConfigMaps in favor of `PrometheusRule` CRDs
+## 0.22.0 / 2018-07-09
+
+* [FEATURE] Allow setting volume name via volumetemplateclaimtemplate in prom and alertmanager (#1538)
+* [FEATURE] Allow setting custom tags of container images (#1584)
+* [ENHANCEMENT] Update default Thanos to v0.1.0-rc.2 (#1585)
+* [ENHANCEMENT] Split rule config map mounted into Prometheus if it exceeds Kubernetes config map limit (#1562)
+* [BUGFIX] Mount Prometheus data volume into Thanos sidecar & pass correct path to Thanos sidecar (#1583)
+
## 0.21.0 / 2018-06-28
* [CHANGE] Default to Prometheus v2.3.1.
diff --git a/Documentation/user-guides/cluster-monitoring.md b/Documentation/user-guides/cluster-monitoring.md
index b12f25cfb..8dad3ff3a 100644
--- a/Documentation/user-guides/cluster-monitoring.md
+++ b/Documentation/user-guides/cluster-monitoring.md
@@ -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.21.0
- image: quay.io/coreos/prometheus-operator:v0.21.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.22.0
+ image: quay.io/coreos/prometheus-operator:v0.22.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/Documentation/user-guides/getting-started.md b/Documentation/user-guides/getting-started.md
index 00c618d38..d88cd5f63 100644
--- a/Documentation/user-guides/getting-started.md
+++ b/Documentation/user-guides/getting-started.md
@@ -116,8 +116,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.21.0
- image: quay.io/coreos/prometheus-operator:v0.21.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.22.0
+ image: quay.io/coreos/prometheus-operator:v0.22.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/Makefile b/Makefile
index b644e7436..16931b6be 100644
--- a/Makefile
+++ b/Makefile
@@ -110,16 +110,17 @@ pkg/client/monitoring/v1/openapi_generated.go: pkg/client/monitoring/v1/types.go
-p github.com/coreos/prometheus-operator/pkg/client/monitoring/v1 \
--go-header-file="$(GOPATH)/src/github.com/coreos/prometheus-operator/.header"
-bundle.yaml: example/rbac/prometheus-operator/*.yaml
+bundle.yaml: $(shell find example/rbac/prometheus-operator/*.yaml -type f)
hack/generate-bundle.sh
hack/generate/vendor: $(JB_BINARY) jsonnet/prometheus-operator/**
cd hack/generate; $(JB_BINARY) install;
-example/non-rbac/prometheus-operator.yaml: hack/generate/vendor hack/generate/prometheus-operator-non-rbac.jsonnet
+example/non-rbac/prometheus-operator.yaml: hack/generate/vendor hack/generate/prometheus-operator-non-rbac.jsonnet $(shell find jsonnet -type f)
hack/generate/build-non-rbac-prometheus-operator.sh
-example/rbac/prometheus-operator/*.yaml: hack/generate/vendor hack/generate/prometheus-operator-rbac.jsonnet
+RBAC_MANIFESTS = example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml example/rbac/prometheus-operator/prometheus-operator-cluster-role-binding.yaml example/rbac/prometheus-operator/prometheus-operator-service-account.yaml example/rbac/prometheus-operator/prometheus-operator-deployment.yaml
+$(RBAC_MANIFESTS): hack/generate/vendor hack/generate/prometheus-operator-rbac.jsonnet $(shell find jsonnet -type f)
hack/generate/build-rbac-prometheus-operator.sh
jsonnet/prometheus-operator/prometheus-operator.libsonnet: VERSION
diff --git a/VERSION b/VERSION
index 885415662..215740905 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.21.0
+0.22.0
diff --git a/bundle.yaml b/bundle.yaml
index 5cdcf09b2..408bd2597 100644
--- a/bundle.yaml
+++ b/bundle.yaml
@@ -98,8 +98,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.21.0
- image: quay.io/coreos/prometheus-operator:v0.21.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.22.0
+ image: quay.io/coreos/prometheus-operator:v0.22.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/contrib/kube-prometheus/manifests/0prometheus-operator-deployment.yaml b/contrib/kube-prometheus/manifests/0prometheus-operator-deployment.yaml
index df15b9542..faca5a844 100644
--- a/contrib/kube-prometheus/manifests/0prometheus-operator-deployment.yaml
+++ b/contrib/kube-prometheus/manifests/0prometheus-operator-deployment.yaml
@@ -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.21.0
- image: quay.io/coreos/prometheus-operator:v0.21.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.22.0
+ image: quay.io/coreos/prometheus-operator:v0.22.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/example/non-rbac/prometheus-operator.yaml b/example/non-rbac/prometheus-operator.yaml
index 9cf916ca6..f4c61458a 100644
--- a/example/non-rbac/prometheus-operator.yaml
+++ b/example/non-rbac/prometheus-operator.yaml
@@ -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.21.0
- image: quay.io/coreos/prometheus-operator:v0.21.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.22.0
+ image: quay.io/coreos/prometheus-operator:v0.22.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml b/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml
index 6a6d20364..cc6d2428b 100644
--- a/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml
+++ b/example/rbac/prometheus-operator/prometheus-operator-deployment.yaml
@@ -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.21.0
- image: quay.io/coreos/prometheus-operator:v0.21.0
+ - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.22.0
+ image: quay.io/coreos/prometheus-operator:v0.22.0
name: prometheus-operator
ports:
- containerPort: 8080
diff --git a/jsonnet/prometheus-operator/prometheus-operator.libsonnet b/jsonnet/prometheus-operator/prometheus-operator.libsonnet
index b11e3f4d1..303d37a11 100644
--- a/jsonnet/prometheus-operator/prometheus-operator.libsonnet
+++ b/jsonnet/prometheus-operator/prometheus-operator.libsonnet
@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
namespace: 'default',
versions+:: {
- prometheusOperator: 'v0.21.0',
+ prometheusOperator: 'v0.22.0',
configmapReloader: 'v0.0.1',
},