Merge pull request #583 from garden-io/release-v0.9.3-0

Release v0.9.3 0

CHANGELOG.md

@@ -1,4 +1,47 @@
 
+<a name="v0.9.3-0"></a>
+## [v0.9.3-0](https://github.com/garden-io/garden/compare/v0.9.2...v0.9.3-0) (2019-03-01)
+
+### Bug Fixes
+
+* allow ingress annotations in service status ([fac3193](https://github.com/garden-io/garden/commit/fac3193))
+* openfaas plugin bug ([d7cf528](https://github.com/garden-io/garden/commit/d7cf528))
+* **k8s:** don't abort deployment on FailedMount warning ([90ac36c](https://github.com/garden-io/garden/commit/90ac36c))
+* **vcs:** untracked files didn't update version timestamp correctly ([3b85c35](https://github.com/garden-io/garden/commit/3b85c35))
+
+### Features
+
+* **cli:** print ingress endpoints after deploying ([b7961ec](https://github.com/garden-io/garden/commit/b7961ec))
+* **container:** add `build.targetImage` parameter ([9bf6aa1](https://github.com/garden-io/garden/commit/9bf6aa1))
+* **k8s:** support service and ingress annotations on container module ([894bd1f](https://github.com/garden-io/garden/commit/894bd1f))
+
+
+<a name="v0.9.2"></a>
+## [v0.9.2](https://github.com/garden-io/garden/compare/v0.9.1...v0.9.2) (2019-02-22)
+
+### Bug Fixes
+
+* fixed bug in configuring flat-config modules ([fd5bed8](https://github.com/garden-io/garden/commit/fd5bed8))
+* don't emit taskPending if task is skipped ([74e2c5d](https://github.com/garden-io/garden/commit/74e2c5d))
+* clean up field usage in example projects ([7ed2da3](https://github.com/garden-io/garden/commit/7ed2da3))
+* **helm:** filter out test pods when deploying charts ([b646236](https://github.com/garden-io/garden/commit/b646236))
+* **helm:** allow duplicate keys in template ([5153857](https://github.com/garden-io/garden/commit/5153857))
+* **k8s:** kubernetes dashboard wasn't showing up in dashboard ([2b76841](https://github.com/garden-io/garden/commit/2b76841))
+* **k8s:** fix RBAC issues with kubernetes-dashboard on minikube ([291f368](https://github.com/garden-io/garden/commit/291f368))
+* **k8s:** don't use --wait when installing using Helm ([02cd157](https://github.com/garden-io/garden/commit/02cd157))
+* **k8s:** don't error on pod scheduling warning ([49f8115](https://github.com/garden-io/garden/commit/49f8115))
+* **local-k8s:** always use force flag when deploying to garden-system ns ([6cbe064](https://github.com/garden-io/garden/commit/6cbe064))
+* **local-k8s:** remove hardcoded ingress class ([9eb6052](https://github.com/garden-io/garden/commit/9eb6052))
+* **local-k8s:** don't install nginx when running with Minikube ([056924b](https://github.com/garden-io/garden/commit/056924b))
+* **templates:** add prefix to versionString ([fe9cd49](https://github.com/garden-io/garden/commit/fe9cd49))
+
+### Features
+
+* add support for flat config style ([fecde8b](https://github.com/garden-io/garden/commit/fecde8b))
+* allow multiple modules in a single file ([ff4d370](https://github.com/garden-io/garden/commit/ff4d370))
+* don't restart command when config is invalid ([2a534b1](https://github.com/garden-io/garden/commit/2a534b1))
+
+
 <a name="v0.9.1"></a>
 ## [v0.9.1](https://github.com/garden-io/garden/compare/v0.9.0...v0.9.1) (2019-02-12)
 

CONTRIBUTING.md

@@ -169,14 +169,14 @@ To make a new release, set your current working directory to the garden root dir
 1. Run the release script: `./bin/release.tsx <minor | patch | preminor | prepatch | prerelease> [--force]`. The script does the following:
     * Checks out a branch named `release-<version>`.
     * Updates `package.json` and `package-lock.json` for `garden-service` and the changelog.
-    * Commits the changes, tags the commit and pushes the tag, triggering a CI process the creates the release artifacts.
+    * Commits the changes, tags the commit and pushes the tag and branch, triggering a CI process the creates the release artifacts.
 2. Open the [Garden project on CircleCI](https://circleci.com/gh/garden-io/garden) and browse to the job marked `release-service-pkg`. Open the **Artifacts** tab and download the listed artifacts.
 3. Go to our Github [Releases tab](https://github.com/garden-io/garden/releases) and click the **Draft a new release** button.
 4. Fill in the **Tag version** and **Release title** fields with the new release version (same as you used for the tag).
 5. Upload the downloaded artifacts.
 6. Write release notes (not necessary for RCs). The notes should _at least_ contain the changelog. To generate a changelog for just that tag, run `git-chglog <tag-name>`.
 7. Click the **Publish release** button.
-8. Push the branch and make a pull request.
+8. Make a pull request for the branch that was pushed by the script.
 9. If you're making an RC, you're done! Otherwise, you need to update Homebrew package: `gulp update-brew`.
 
 ## Changelog

bin/release.ts

@@ -21,6 +21,7 @@ const RELEASE_TYPES = ["minor", "patch", "preminor", "prepatch", "prerelease"]
  * 7. Tag the commit.
  * 8. Push the tag. This triggers CircleCI process that creates the release artifacts.
  * 9. If we're making a minor release, update links to examples and re-push the tag.
+ * 10. Pushes the release branch to Github.
  *
  * Usage: ./bin/release.ts <minor | patch | preminor | prepatch | prerelease> [--force]
  */
@@ -119,12 +120,18 @@ async function release() {
     await createTag(version, gardenRoot, true)
   }
 
+  console.log("Pushing release branch...")
+  await execa("git", ["push", "origin", branchName, "--no-verify"], { cwd: gardenRoot })
+
   console.log(deline`
     \nVersion ${chalk.bold.cyan(version)} has been ${chalk.bold("tagged")}, ${chalk.bold("committed")},
     and ${chalk.bold("pushed")} to Github! 🎉\n
 
     A CI job that creates the release artifacts is currently in process: https://circleci.com/gh/garden-io/garden\n
 
+    Create a pull request for ${branchName} on Github by visting:
+      https://github.com/garden-io/garden/pull/new/${branchName}
+
     Please refer to our contributing docs for the next steps:
     https://github.com/garden-io/garden/blob/master/CONTRIBUTING.md
   `)
@@ -168,7 +175,7 @@ async function rollBack(gardenRoot: string) {
 
 async function prompt(version: string): Promise<boolean> {
   const message = deline`
-    Running this script will create a tag for ${chalk.bold.cyan(version)} and push it to Github.
+    Running this script will create a branch and a tag for ${chalk.bold.cyan(version)} and push them to Github.
     This triggers a CI process that creates the release artifacts.\n
 
     Are you sure you want to continue?

garden-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "garden-cli",
-  "version": "0.9.2",
+  "version": "0.9.3-0",
   "description": "A full-featured development framework for containers and serverless",
   "repository": {
     "type": "git",