Merge pull request #247 from kinvolk/krnowak/release

Some fixes for the release process and 0.6.0
habitat-sh · Apr 23, 2018 · 612db74 · 612db74
2 parents d30cd44 + a602518
commit 612db74
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Habitat operator CHANGELOG
 
+## [v0.6.0](https://github.com/kinvolk/habitat-operator/tree/v0.6.0) (20-4-2018)
+[Full changelog](https://github.com/kinvolk/habitat-operator/compare/v0.5.1...v0.6.0)
+
+### Features & Enhancements
+
+- New "version" of the habitat CRD that uses StatefulSets, has persistence functionality. The previous version that uses Deployments is still supported but is frozen [#201](https://github.com/habitat-sh/habitat-operator/pull/201) [#240](https://github.com/habitat-sh/habitat-operator/pull/240)
+- Oldest supported Habitat Supervisor is 0.52 [#190](https://github.com/habitat-sh/habitat-operator/pull/190)
+
+Please compare the `v1beta1` and `v1beta2` manifests of the standalone example in `examples/v1beta1/habitat.yml` and `examples/standalone/habitat.yml`, respectively, to compare the immediate differences between them. Please refer to `examples/persisted/habitat.yml` for an example of the persistence functionality.
+
 ## [v0.5.1](https://github.com/kinvolk/habitat-operator/tree/v0.5.1) (14-2-2018)
 [Full changelog](https://github.com/kinvolk/habitat-operator/compare/v0.5.0...v0.5.1)
 

diff --git a/Makefile b/Makefile
@@ -40,8 +40,23 @@ update-version:
 		-e "s/tag:.*/tag: v$$(cat VERSION)/g" \
 		-e "s/version:.*/version: $$(cat VERSION)/g" \
 		'{}' \;
-	find examples helm -regex '.*\.ya?ml$$.bak' -type f \
+	find examples helm -regex '.*\.ya?ml.bak' -type f \
 		-exec rm '{}' \;
+	sed \
+		-i.bak \
+		-e 's/\(e\.g `v\).*\(`\)/\1'"$$(cat VERSION)"'\2/' \
+		helm/habitat-operator/README.md
+	rm -f helm/habitat-operator/README.md.bak
+	sed \
+		-i.bak \
+		-e "s/\(habitat-operator:v\).*/\1$$(cat VERSION)/g" \
+		test/e2e/v1beta1/resources/operator/deployment.yml
+	rm -f test/e2e/v1beta1/resources/operator/deployment.yml.bak
+	sed \
+		-i.bak \
+		-e 's/\(`\*: cut \)[.[:digit:]]*\( release`\)/\1'"$$(cat VERSION)"'\2/' \
+		release.md
+	rm -f release.md.bak
 
 codegen:
 	CODEGEN_PKG=../../../k8s.io/code-generator hack/update-codegen.sh

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.1
+0.6.0
diff --git a/examples/habitat-operator-deployment.yml b/examples/habitat-operator-deployment.yml
@@ -11,4 +11,4 @@ spec:
     spec:
       containers:
       - name: habitat-operator
-        image: habitat/habitat-operator:v0.5.1
+        image: habitat/habitat-operator:v0.6.0
diff --git a/examples/rbac/habitat-operator.yml b/examples/rbac/habitat-operator.yml
@@ -11,5 +11,5 @@ spec:
     spec:
       containers:
       - name: habitat-operator
-        image: habitat/habitat-operator:v0.5.1
+        image: habitat/habitat-operator:v0.6.0
       serviceAccountName: habitat-operator
diff --git a/helm/habitat-operator/Chart.yaml b/helm/habitat-operator/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
 name: habitat-operator
 sources:
   - https://github.com/habitat-sh/habitat-operator
-version: 0.5.1
+version: 0.6.0
diff --git a/helm/habitat-operator/README.md b/helm/habitat-operator/README.md
@@ -60,7 +60,7 @@ The following table lists the configurable parameters of the habitat-operator ch
 Parameter | Description | Default
 --- | --- | ---
 `image.repository` | Image | `docker.io/habitat/habitat-operator`
-`image.tag` | Image tag | The latest release tag (e.g `v0.4.0`)
+`image.tag` | Image tag | The latest release tag (e.g `v0.6.0`)
 `image.pullPolicy` | Image pull policy | `IfNotPresent`
 `nodeSelector` | Node labels for pod assignment | `{}`
 `rbacEnable` | If true, create & use RBAC resources | `true`

diff --git a/helm/habitat-operator/values.yaml b/helm/habitat-operator/values.yaml
@@ -2,7 +2,7 @@
 ##
 image:
   repository: docker.io/habitat/habitat-operator
-  tag: v0.5.1
+  tag: v0.6.0
   pullPolicy: IfNotPresent
 
 ## Node labels for habitat-operator pod assignment

diff --git a/release.md b/release.md
@@ -5,11 +5,11 @@ Habitat operator follows [Semantic Versioning](https://semver.org/).
 ## Pull request
 
 First bump the version in the `VERSION` file which is located in the top level directory of the repository.
-Run the following command to update version across files:
+Then run the following command to update version across files:
 
     make update-version
 
-Document the changes in this release in the `CHANGELOG.md` file, following the already established pattern. Commit all the changes and `CHANGELOG.md` file under one commit message e.g.: `*: cut 0.2.0 release`. Create a PR with the changes.
+Document the changes in this release in the `CHANGELOG.md` file, following the already established pattern. Commit all the changes and `CHANGELOG.md` file under one commit message e.g.: `*: cut 0.6.0 release`. Create a PR with the changes.
 
 ## Tag the release
 

diff --git a/test/e2e/v1beta1/resources/operator/deployment.yml b/test/e2e/v1beta1/resources/operator/deployment.yml
@@ -13,5 +13,5 @@ spec:
     spec:
       containers:
       - name: habitat-operator
-        image: habitat/habitat-operator:v0.3.0
+        image: habitat/habitat-operator:v0.6.0
       serviceAccountName: habitat-operator-v1beta1