From d0d9346da2ed7cbe5f01c2d27eff3e75ebc5d4c9 Mon Sep 17 00:00:00 2001
From: Hongchao Deng <hongchaodeng1@gmail.com>
Date: Mon, 25 Sep 2017 12:44:43 -0700
Subject: [PATCH] release: 0.6.0

---
 CHANGELOG.md                | 19 +++++++++++++++++++
 example/deployment-aws.yaml |  2 +-
 example/deployment.yaml     |  2 +-
 version/version.go          |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc17121c5..61cb787e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,30 @@
 ## [Unreleased]
 
+### Added
+
+### Changed
+
+### Removed
+
+### Fixed
+
+### Deprecated
+
+### Security
+
+
+## [Release 0.6.0]
+
 **BREAKING CHANGE**: operator level S3 backup is removed. See [upgrade](./doc/user/upgrade/upgrade_guide.md) on how to upgrade from 0.5.x to 0.6.0. 
 
 ### Added
 
+- Add cluster events into EtcdCluster custom resource. See `doc/user/conditions_and_events.md` .
+
 ### Changed
 
+- Redefine status.conditions. See `doc/user/conditions_and_events.md` .
+
 ### Removed
 
 - Remove operator level S3 flag.
diff --git a/example/deployment-aws.yaml b/example/deployment-aws.yaml
index d474f5e29..cc444f587 100644
--- a/example/deployment-aws.yaml
+++ b/example/deployment-aws.yaml
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: etcd-operator
-        image: quay.io/coreos/etcd-operator:v0.5.2
+        image: quay.io/coreos/etcd-operator:v0.6.0
         command: 
         - /usr/local/bin/etcd-operator
         - --pv-provisioner=kubernetes.io/aws-ebs
diff --git a/example/deployment.yaml b/example/deployment.yaml
index feda553d6..b2e6b2a18 100644
--- a/example/deployment.yaml
+++ b/example/deployment.yaml
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: etcd-operator
-        image: quay.io/coreos/etcd-operator:v0.5.2
+        image: quay.io/coreos/etcd-operator:v0.6.0
         env:
         - name: MY_POD_NAMESPACE
           valueFrom:
diff --git a/version/version.go b/version/version.go
index e1543d8c7..af55145b2 100644
--- a/version/version.go
+++ b/version/version.go
@@ -15,6 +15,6 @@
 package version
 
 var (
-	Version = "0.5.2+git"
+	Version = "0.6.0"
 	GitSHA  = "Not provided (use ./build instead of go build)"
 )