From c83b6c9eba41c4a14464e9b1a9ce921f9c16f75a Mon Sep 17 00:00:00 2001
From: Christian Simon <simon@swine.de>
Date: Mon, 4 Mar 2019 15:37:38 +0000
Subject: [PATCH] Release 0.6.1

---
 CHANGELOG.md                                  | 24 +++++++++++++++++++
 README.md                                     |  4 ++--
 .../templates/bastion_user_data.yaml.template |  2 +-
 .../puppet_agent_user_data.yaml.template      |  2 +-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 237006bb2e..9a8435a8da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,28 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.6.1]: 0.6.1 - 2019-03-04
+
+A problem during our build process has built a broken Darwin binary. Small
+bug fix release.
+
+### Fixed
+
+* Increase inotify watch limits of instances with Kubelet (#757 [@simonswine](github.com/simonswine))
+
+### Versions
+
+| Application | Supported versions  | Default   |
+|-------------|--------------------:|----------:|
+| Packer      |                     | `1.2.5`   |
+| Terraform   |                     | `0.11.11` |
+| Consul      |                     | `1.2.4`   |
+| Vault       |                     | `0.9.6`   |
+| Kubernetes  | `>= 1.10 && < 1.14` | `1.12.5`  |
+| Calico      |                     | `3.1.4`   |
+| Vault Helper|                     | `0.9.13`  |
+| Etcd        |                     | `3.2.25`  |
+
 ## [0.6.0]: 0.6.0 - 2019-02-27
 
 The 0.6 release of Tarmak comes with many more features and improvements to
@@ -451,6 +473,8 @@ This detailed changes have happend since the last minor version of Tarmak:
 | Vault       |                    | `0.7.3`  |
 | Kubernetes  | `>= 1.5 && < 1.8`  | `1.7.7`  |
 
+[0.6.1]: https://github.com/jetstack/tarmak/compare/0.6.0...0.6.1
+[0.6.0]: https://github.com/jetstack/tarmak/compare/0.5.0...0.6.0
 [0.5.3]: https://github.com/jetstack/tarmak/compare/0.5.2...0.5.3
 [0.5.2]: https://github.com/jetstack/tarmak/compare/0.5.1...0.5.2
 [0.5.1]: https://github.com/jetstack/tarmak/compare/0.5.0...0.5.1
diff --git a/README.md b/README.md
index 1bcf48639d..eed2228636 100644
--- a/README.md
+++ b/README.md
@@ -20,8 +20,8 @@ including Terraform, Puppet and systemd.
 Get a ready built version of tarmak from [the releases
 page](https://github.com/jetstack/tarmak/releases):
 
-    $ wget https://github.com/jetstack/tarmak/releases/download/0.6.0/tarmak_0.6.0_linux_amd64
-    $ mv tarmak_0.6.0_linux_amd64 tarmak
+    $ wget https://github.com/jetstack/tarmak/releases/download/0.6.1/tarmak_0.6.1_linux_amd64
+    $ mv tarmak_0.6.1_linux_amd64 tarmak
     $ chmod +x tarmak
 
 If you want compile from source, follow the [build
diff --git a/terraform/amazon/templates/bastion_user_data.yaml.template b/terraform/amazon/templates/bastion_user_data.yaml.template
index edfd9a93c6..25dca8ddea 100644
--- a/terraform/amazon/templates/bastion_user_data.yaml.template
+++ b/terraform/amazon/templates/bastion_user_data.yaml.template
@@ -68,7 +68,7 @@ write_files:
 {{- else }}
     Environment=AIRWORTHY_VERSION=0.2.0
     Environment=AIRWORTHY_HASH=2d69cfe0b92f86481805c28d0b8ae47a8ffa6bb2373217e7c5215d61fc9efa1d
-    Environment=WING_VERSION=0.6.0
+    Environment=WING_VERSION=0.6.1
     ExecStartPre=/bin/sh -c '\
       set -e ;\
       test -x /opt/wing-$${WING_VERSION}/wing && exit 0 ;\
diff --git a/terraform/amazon/templates/puppet_agent_user_data.yaml.template b/terraform/amazon/templates/puppet_agent_user_data.yaml.template
index 12d093ff67..ecdd043fee 100644
--- a/terraform/amazon/templates/puppet_agent_user_data.yaml.template
+++ b/terraform/amazon/templates/puppet_agent_user_data.yaml.template
@@ -25,7 +25,7 @@ write_files:
 {{- else }}
     Environment=AIRWORTHY_VERSION=0.2.0
     Environment=AIRWORTHY_HASH=2d69cfe0b92f86481805c28d0b8ae47a8ffa6bb2373217e7c5215d61fc9efa1d
-    Environment=WING_VERSION=0.6.0
+    Environment=WING_VERSION=0.6.1
     ExecStartPre=/bin/sh -c '\
       set -e ;\
       test -x /opt/wing-$${WING_VERSION}/wing && exit 0 ;\