From f1bae298eddbbaafeddd45aaebac8a64ebb68630 Mon Sep 17 00:00:00 2001
From: Ricardo Hernandez <430024+richerve@users.noreply.github.com>
Date: Thu, 26 Jul 2018 10:03:44 +0100
Subject: [PATCH] Bump Alertmanager image to 0.15.1 (#1695)

* Bump alertmanager image to v0.15.1

* Bump kube-prometheus

* Bump alertmanager on kube-prometheus values
---
 helm/alertmanager/Chart.yaml           | 4 ++--
 helm/alertmanager/values.yaml          | 2 +-
 helm/kube-prometheus/Chart.yaml        | 2 +-
 helm/kube-prometheus/requirements.yaml | 2 +-
 helm/kube-prometheus/values.yaml       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/helm/alertmanager/Chart.yaml b/helm/alertmanager/Chart.yaml
index 6ca4059ad..a266d51a3 100644
--- a/helm/alertmanager/Chart.yaml
+++ b/helm/alertmanager/Chart.yaml
@@ -8,8 +8,8 @@ name: alertmanager
 sources:
   - https://github.com/coreos/prometheus-operator
   - https://github.com/prometheus/alertmanager
-version: 0.1.5
-appVersion: "0.14.0"
+version: 0.1.6
+appVersion: "0.15.1"
 home: https://github.com/prometheus/alertmanager 
 keywords:
 - alertmanager
diff --git a/helm/alertmanager/values.yaml b/helm/alertmanager/values.yaml
index 118f3e1d5..7f48b504c 100755
--- a/helm/alertmanager/values.yaml
+++ b/helm/alertmanager/values.yaml
@@ -64,7 +64,7 @@ additionalRulesLabels: {}
 ##
 image:
   repository: quay.io/prometheus/alertmanager
-  tag: v0.14.0
+  tag: v0.15.1
 
 ## Labels to be added to the Alertmanager
 ##
diff --git a/helm/kube-prometheus/Chart.yaml b/helm/kube-prometheus/Chart.yaml
index 8fd493940..993454b73 100644
--- a/helm/kube-prometheus/Chart.yaml
+++ b/helm/kube-prometheus/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
 name: kube-prometheus
 sources:
   - https://github.com/coreos/prometheus-operator
-version: 0.0.103
+version: 0.0.104
diff --git a/helm/kube-prometheus/requirements.yaml b/helm/kube-prometheus/requirements.yaml
index 92596f385..849ee202f 100644
--- a/helm/kube-prometheus/requirements.yaml
+++ b/helm/kube-prometheus/requirements.yaml
@@ -1,6 +1,6 @@
 dependencies:
   - name: alertmanager
-    version: 0.1.5
+    version: 0.1.6
     #e2e-repository: file://../alertmanager
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
     condition: deployAlertManager
diff --git a/helm/kube-prometheus/values.yaml b/helm/kube-prometheus/values.yaml
index c76f213b6..3a2814d07 100644
--- a/helm/kube-prometheus/values.yaml
+++ b/helm/kube-prometheus/values.yaml
@@ -57,7 +57,7 @@ alertmanager:
   ##
   image:
     repository: quay.io/prometheus/alertmanager
-    tag: v0.14.0
+    tag: v0.15.1
 
   ingress:
     ## If true, Alertmanager Ingress will be created