Merge pull request #987 from hongchaodeng/v

release: v0.2.5
coreos · Apr 24, 2017 · e6c62c0 · e6c62c0
2 parents 95b1b58 + c5f7981
commit e6c62c0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
-## [Unreleased 0.2.5]
+## [Unreleased 0.2.6]
+
+## [Release 0.2.5]
 
 ### Added
 

diff --git 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.2.4
+        image: quay.io/coreos/etcd-operator:v0.2.5
         command: 
         - /usr/local/bin/etcd-operator
         - --pv-provisioner=kubernetes.io/aws-ebs

diff --git a/example/deployment-s3-backup.yaml.template b/example/deployment-s3-backup.yaml.template
@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
       - name: etcd-operator
-        image: quay.io/coreos/etcd-operator:v0.2.4
+        image: quay.io/coreos/etcd-operator:v0.2.5
         command:
         - /usr/local/bin/etcd-operator
         - --backup-aws-secret=aws # assuming the configmap and secret are both named 'aws'

diff --git 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.2.4
+        image: quay.io/coreos/etcd-operator:v0.2.5
         env:
         - name: MY_POD_NAMESPACE
           valueFrom:

diff --git a/version/version.go b/version/version.go
@@ -15,6 +15,6 @@
 package version
 
 var (
-	Version = "0.2.4+git"
+	Version = "0.2.5"
 	GitSHA  = "Not provided (use ./build instead of go build)"
 )