From cb913988922ff16ec33b6bc269e58b87fd1063d7 Mon Sep 17 00:00:00 2001
From: Michael Bridgen <michael@weave.works>
Date: Tue, 5 Jun 2018 14:28:44 +0100
Subject: [PATCH] Update changelog and deploy example for flux 1.4.0

---
 CHANGELOG.md                | 33 +++++++++++++++++++++++++++++++++
 deploy/flux-deployment.yaml |  2 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cbaa1492..587a5c24d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,36 @@
+## 1.4.0 (2018-06-05)
+
+This release includes a rewrite of the YAML updating code, removing
+the restrictions on using List resources and files with multiple YAML
+documents, as well as fixing various bugs (like being confused by the
+indentation of `container` blocks).
+
+See https://github.com/weaveworks/flux/blob/1.4.0/site/requirements.md
+for remaining constraints.
+
+The YAML parser preserves comments and literal quoting, but may
+reindent blocks the first time it changes a file.
+
+### Fixes
+
+- Correct an issue the led to Flux incorrectly reporting resources as
+  read-only [weaveworks/flux#1119](https://github.com/weaveworks/flux/pull/1119)
+- Some YAML update problems were fixed by the rewrite, the most egregious being:
+  - botched releases when a YAML has indented container blocks
+    [weaveworks/flux#1082](https://github.com/weaveworks/flux/issues/1082)
+  - mangled annotations when using multidoc YAML files
+    [weaveworks/flux#1044](https://github.com/weaveworks/flux/issues/1044)
+
+### Improvements
+
+- Rewrite the YAML update code to use a round-tripping parser, rather
+  than regular expressions
+  [weaveworks/flux#976](https://github.com/weaveworks/flux/pull/976). This
+  removes the restrictions on how YAMLs are formatted, though there
+  are still going to be corner cases in the parser
+  ([verifying changes](https://github.com/weaveworks/flux/pull/1094)
+  will mitigate those by failing updates that would corrupt files).
+
 ## 1.3.1 (2018-05-29)
 
 ### Fixes
diff --git a/deploy/flux-deployment.yaml b/deploy/flux-deployment.yaml
index 3ce2c7f61..cf5b1cb4a 100644
--- a/deploy/flux-deployment.yaml
+++ b/deploy/flux-deployment.yaml
@@ -31,7 +31,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://quay.io/weaveworks/flux
         # and replace the tag here.
-        image: quay.io/weaveworks/flux:1.3.1
+        image: quay.io/weaveworks/flux:1.4.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3030 # informational