From 121fc57aa646b4ae9583c7003cb23b86cc8e03f4 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Thu, 3 Oct 2019 14:46:34 +0300
Subject: [PATCH 1/3] Update Prometheus to v2.12.0

---
 charts/flagger/templates/prometheus.yaml  | 2 +-
 kustomize/base/prometheus/deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/charts/flagger/templates/prometheus.yaml b/charts/flagger/templates/prometheus.yaml
index bca9ab147..c49d3f96b 100644
--- a/charts/flagger/templates/prometheus.yaml
+++ b/charts/flagger/templates/prometheus.yaml
@@ -238,7 +238,7 @@ spec:
       serviceAccountName: {{ template "flagger.serviceAccountName" . }}-prometheus
       containers:
         - name: prometheus
-          image: "docker.io/prom/prometheus:v2.10.0"
+          image: "docker.io/prom/prometheus:v2.12.0"
           imagePullPolicy: IfNotPresent
           args:
             - '--storage.tsdb.retention=2h'
diff --git a/kustomize/base/prometheus/deployment.yaml b/kustomize/base/prometheus/deployment.yaml
index 3d5a27361..9a96d9198 100644
--- a/kustomize/base/prometheus/deployment.yaml
+++ b/kustomize/base/prometheus/deployment.yaml
@@ -19,7 +19,7 @@ spec:
       serviceAccountName: flagger-prometheus
       containers:
           - name: prometheus
-            image: prom/prometheus:v2.10.0
+            image: prom/prometheus:v2.12.0
             imagePullPolicy: IfNotPresent
             args:
               - '--storage.tsdb.retention=2h'

From ff7d4e747c60567e7774efbb653e8a1d38b468b6 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Thu, 3 Oct 2019 14:48:26 +0300
Subject: [PATCH 2/3] Update Linkerd to v2.5.0

---
 test/e2e-linkerd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/e2e-linkerd.sh b/test/e2e-linkerd.sh
index 15db6ea27..295f18ca6 100755
--- a/test/e2e-linkerd.sh
+++ b/test/e2e-linkerd.sh
@@ -2,7 +2,7 @@
 
 set -o errexit
 
-LINKERD_VER="stable-2.4.0"
+LINKERD_VER="stable-2.5.0"
 REPO_ROOT=$(git rev-parse --show-toplevel)
 export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 

From 268fa9999fbf44d589a67c8487efadd737627463 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Thu, 3 Oct 2019 15:00:12 +0300
Subject: [PATCH 3/3] Release v0.18.6

---
 CHANGELOG.md                              | 14 ++++++++++++++
 README.md                                 |  2 +-
 artifacts/flagger/deployment.yaml         |  2 +-
 charts/flagger/Chart.yaml                 |  4 ++--
 charts/flagger/values.yaml                |  2 +-
 kustomize/base/flagger/kustomization.yaml |  2 +-
 pkg/version/version.go                    |  2 +-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e984b5b7..ca61fb96e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project are documented in this file.
 
+## 0.18.6 (2019-10-03) 
+
+Adds support for App Mesh conformance tests and latency metric checks
+
+#### Improvements 
+
+- Add support for acceptance testing when using App Mesh [#322](https://github.com/weaveworks/flagger/pull/322)
+- Add Kustomize installer for App Mesh [#310](https://github.com/weaveworks/flagger/pull/310)
+- Update Linkerd to v2.5.0 and Prometheus to v2.12.0 [#323](https://github.com/weaveworks/flagger/pull/323)
+
+#### Fixes
+
+- Fix slack/teams notification fields mapping [#318](https://github.com/weaveworks/flagger/pull/318)
+
 ## 0.18.5 (2019-10-02) 
 
 Adds support for [confirm-promotion](https://docs.flagger.app/how-it-works#webhooks) webhooks and blue/green deployments when using a service mesh
diff --git a/README.md b/README.md
index a598f5099..aaa3c60e5 100644
--- a/README.md
+++ b/README.md
@@ -163,7 +163,7 @@ For more details on how the canary analysis and promotion works please [read the
 | A/B testing (headers and cookies filters)    | :heavy_check_mark: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_check_mark: | :heavy_minus_sign: |
 | Webhooks (acceptance/load testing)           | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Request success rate check (L7 metric)       | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| Request duration check (L7 metric)           | :heavy_check_mark: | :heavy_check_mark: | :heavy_minus_sign: | :heavy_check_mark: | :heavy_check_mark: |
+| Request duration check (L7 metric)           | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Custom promql checks                         | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
 | Traffic policy, CORS, retries and timeouts   | :heavy_check_mark: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: | :heavy_minus_sign: |
 
diff --git a/artifacts/flagger/deployment.yaml b/artifacts/flagger/deployment.yaml
index 19df49d04..d4a850f1f 100644
--- a/artifacts/flagger/deployment.yaml
+++ b/artifacts/flagger/deployment.yaml
@@ -22,7 +22,7 @@ spec:
       serviceAccountName: flagger
       containers:
       - name: flagger
-        image: weaveworks/flagger:0.18.5
+        image: weaveworks/flagger:0.18.6
         imagePullPolicy: IfNotPresent
         ports:
         - name: http
diff --git a/charts/flagger/Chart.yaml b/charts/flagger/Chart.yaml
index fe8c65c3d..8b28a853d 100644
--- a/charts/flagger/Chart.yaml
+++ b/charts/flagger/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: flagger
-version: 0.18.5
-appVersion: 0.18.5
+version: 0.18.6
+appVersion: 0.18.6
 kubeVersion: ">=1.11.0-0"
 engine: gotpl
 description: Flagger is a Kubernetes operator that automates the promotion of canary deployments using Istio, Linkerd, App Mesh, Gloo or NGINX routing for traffic shifting and Prometheus metrics for canary analysis.
diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml
index 61a687f49..2c135187c 100644
--- a/charts/flagger/values.yaml
+++ b/charts/flagger/values.yaml
@@ -2,7 +2,7 @@
 
 image:
   repository: weaveworks/flagger
-  tag: 0.18.5
+  tag: 0.18.6
   pullPolicy: IfNotPresent
   pullSecret:
 
diff --git a/kustomize/base/flagger/kustomization.yaml b/kustomize/base/flagger/kustomization.yaml
index e60613846..b1a20bfb4 100644
--- a/kustomize/base/flagger/kustomization.yaml
+++ b/kustomize/base/flagger/kustomization.yaml
@@ -8,4 +8,4 @@ resources:
   - deployment.yaml
 images:
   - name: weaveworks/flagger
-    newTag: 0.18.5
+    newTag: 0.18.6
diff --git a/pkg/version/version.go b/pkg/version/version.go
index fb7d10c66..e99772a49 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -1,4 +1,4 @@
 package version
 
-var VERSION = "0.18.5"
+var VERSION = "0.18.6"
 var REVISION = "unknown"