From 54b8257c60d6a82577f1788604f34c0c1170cfba Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Wed, 2 Oct 2019 16:51:08 +0300
Subject: [PATCH 1/2] Release v0.18.5

---
 Makefile                                  | 4 ++--
 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 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index e0ceb3de..4a7cb91b 100644
--- a/Makefile
+++ b/Makefile
@@ -31,8 +31,8 @@ run-nop:
 	-metrics-server=https://prometheus.istio.weavedx.com
 
 run-linkerd:
-	GO111MODULE=on go run cmd/flagger/* -kubeconfig=$$HOME/.kube/config -log-level=info -mesh-provider=smi:linkerd -namespace=demo \
-	-metrics-server=https://linkerd-prometheus.istio.weavedx.com
+	GO111MODULE=on go run cmd/flagger/* -kubeconfig=$$HOME/.kube/config -log-level=info -mesh-provider=linkerd -namespace=dev \
+	-metrics-server=https://prometheus.linkerd.flagger.dev
 
 build:
 	GIT_COMMIT=$$(git rev-list -1 HEAD) && GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build  -ldflags "-s -w -X github.com/weaveworks/flagger/pkg/version.REVISION=$${GIT_COMMIT}" -a -installsuffix cgo -o ./bin/flagger ./cmd/flagger/*
diff --git a/artifacts/flagger/deployment.yaml b/artifacts/flagger/deployment.yaml
index 9fdabeb7..19df49d0 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.4
+        image: weaveworks/flagger:0.18.5
         imagePullPolicy: IfNotPresent
         ports:
         - name: http
diff --git a/charts/flagger/Chart.yaml b/charts/flagger/Chart.yaml
index 1250487b..fe8c65c3 100644
--- a/charts/flagger/Chart.yaml
+++ b/charts/flagger/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: flagger
-version: 0.18.4
-appVersion: 0.18.4
+version: 0.18.5
+appVersion: 0.18.5
 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 4ce9ff2d..61a687f4 100644
--- a/charts/flagger/values.yaml
+++ b/charts/flagger/values.yaml
@@ -2,7 +2,7 @@
 
 image:
   repository: weaveworks/flagger
-  tag: 0.18.4
+  tag: 0.18.5
   pullPolicy: IfNotPresent
   pullSecret:
 
diff --git a/kustomize/base/flagger/kustomization.yaml b/kustomize/base/flagger/kustomization.yaml
index 2cced63e..e6061384 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.4
+    newTag: 0.18.5
diff --git a/pkg/version/version.go b/pkg/version/version.go
index 21cef27a..fb7d10c6 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -1,4 +1,4 @@
 package version
 
-var VERSION = "0.18.4"
+var VERSION = "0.18.5"
 var REVISION = "unknown"

From 958af18dc01bf2d65cad443b60a61daac961d611 Mon Sep 17 00:00:00 2001
From: stefanprodan <stefan.prodan@gmail.com>
Date: Wed, 2 Oct 2019 17:51:06 +0300
Subject: [PATCH 2/2] Add changelog for v0.18.5

---
 CHANGELOG.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8462e368..9e984b5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,24 @@
 
 All notable changes to this project are documented in this file.
 
+## 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
+
+#### Features
+
+- Implement confirm-promotion hook [#307](https://github.com/weaveworks/flagger/pull/307)
+- Implement B/G for service mesh providers [#305](https://github.com/weaveworks/flagger/pull/305)
+
+#### Improvements 
+
+- Canary promotion improvements to avoid dropping in-flight requests [#310](https://github.com/weaveworks/flagger/pull/310)
+- Update end-to-end tests to Kubernetes v1.15.3 and Istio 1.3.0 [#306](https://github.com/weaveworks/flagger/pull/306) 
+
+#### Fixes
+
+- Skip primary check for App Mesh [#315](https://github.com/weaveworks/flagger/pull/315)
+
 ## 0.18.4 (2019-09-08) 
 
 Adds support for NGINX custom annotations and Helm v3 acceptance testing