Merge remote-tracking branch 'upstream/master' into Garbage-collectio…

…n-dry-run-fluxcd#1990
jan-schumacher · May 23, 2019 · 55891e5 · 55891e5
2 parents 8c818bf + b16ce40
commit 55891e5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/chart/flux/CHANGELOG.md b/chart/flux/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.9.5 (2019-05-22)
+
+ - Updated Flux to `1.12.3`
+   [weaveworks/flux#2076](https://github.com/weaveworks/flux/pull/2076)
+
 ## 0.9.4 (2019-05-09)
 
  - Updated Helm operator to `0.9.1`

diff --git a/chart/flux/Chart.yaml b/chart/flux/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
-appVersion: "1.12.2"
-version: 0.9.4
+appVersion: "1.12.3"
+version: 0.9.5
 kubeVersion: ">=1.9.0-0"
 name: flux
 description: Flux is a tool that automatically ensures that the state of a cluster matches what is specified in version control

diff --git a/chart/flux/values.yaml b/chart/flux/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 
 image:
   repository: docker.io/weaveworks/flux
-  tag: 1.12.2
+  tag: 1.12.3
   pullPolicy: IfNotPresent
   pullSecret: