From fbf8233ea49d5ac62b1f0323012badff13246efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Wed, 15 Jul 2020 16:10:38 +0200 Subject: [PATCH] [stable/prometheus-operator] Version bump alertmanager and prometheus (#23150) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [stable/prometheus-operator] Version bump prometheus to 2.18.2 https://github.com/prometheus/prometheus/releases/tag/v2.18.2 Signed-off-by: Manuel Rüger * [stable/prometheus-operator] Version bump alertmanager to 0.21.0 https://github.com/prometheus/alertmanager/releases/v0.21.0 Signed-off-by: Manuel Rüger --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/README.md | 4 ++-- stable/prometheus-operator/values.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index f628baccb5..64e0c456b9 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -12,7 +12,7 @@ sources: - https://github.com/coreos/kube-prometheus - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 9.0.0 +version: 9.0.1 appVersion: 0.38.1 tillerVersion: ">=2.12.0" home: https://github.com/coreos/prometheus-operator diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index ad83049c02..45d2e5157c 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -297,7 +297,7 @@ The following tables list the configurable parameters of the prometheus-operator | `prometheus.prometheusSpec.externalLabels` | The labels to add to any time series or alerts when communicating with external systems (federation, remote storage, Alertmanager). | `{}` | | `prometheus.prometheusSpec.externalUrl` | The external URL the Prometheus instances will be available under. This is necessary to generate correct URLs. This is necessary if Prometheus is not served from root of a DNS name. | `""` | | `prometheus.prometheusSpec.image.repository` | Base image to use for a Prometheus deployment. | `quay.io/prometheus/prometheus` | -| `prometheus.prometheusSpec.image.tag` | Tag of Prometheus container image to be deployed. | `v2.18.1` | +| `prometheus.prometheusSpec.image.tag` | Tag of Prometheus container image to be deployed. | `v2.18.2` | | `prometheus.prometheusSpec.listenLocal` | ListenLocal makes the Prometheus server listen on loopback, so that it does not bind against the Pod IP. | `false` | | `prometheus.prometheusSpec.logFormat` | Log format for Prometheus to be configured with. | `logfmt` | | `prometheus.prometheusSpec.logLevel` | Log level for Prometheus to be configured with. | `info` | @@ -380,7 +380,7 @@ The following tables list the configurable parameters of the prometheus-operator | `alertmanager.alertmanagerSpec.containers` | Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to an Alertmanager pod. | `[]` | | `alertmanager.alertmanagerSpec.externalUrl` | The external URL the Alertmanager instances will be available under. This is necessary to generate correct URLs. This is necessary if Alertmanager is not served from root of a DNS name. | `""` | | `alertmanager.alertmanagerSpec.image.repository` | Base image that is used to deploy pods, without tag. | `quay.io/prometheus/alertmanager` | -| `alertmanager.alertmanagerSpec.image.tag` | Tag of Alertmanager container image to be deployed. | `v0.20.0` | +| `alertmanager.alertmanagerSpec.image.tag` | Tag of Alertmanager container image to be deployed. | `v0.21.0` | | `alertmanager.alertmanagerSpec.listenLocal` | ListenLocal makes the Alertmanager server listen on loopback, so that it does not bind against the Pod IP. Note this is only for the Alertmanager UI, not the gossip communication. | `false` | | `alertmanager.alertmanagerSpec.logFormat` | Log format for Alertmanager to be configured with. | `logfmt` | | `alertmanager.alertmanagerSpec.logLevel` | Log level for Alertmanager to be configured with. | `info` | diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml index b9db8cd6f8..b20adad92e 100644 --- a/stable/prometheus-operator/values.yaml +++ b/stable/prometheus-operator/values.yaml @@ -335,7 +335,7 @@ alertmanager: ## image: repository: quay.io/prometheus/alertmanager - tag: v0.20.0 + tag: v0.21.0 ## If true then the user will be responsible to provide a secret with alertmanager configuration ## So when true the config part will be ignored (including templateFiles) and the one in the secret will be used @@ -1578,7 +1578,7 @@ prometheus: ## image: repository: quay.io/prometheus/prometheus - tag: v2.18.1 + tag: v2.18.2 ## Tolerations for use with node taints ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/