Merge pull request #923 from weaveworks/release/1.2.2

Changelog for v1.2.2

CHANGELOG.md

@@ -1,3 +1,24 @@
+## 1.2.2 (2018-01-31)
+
+### Fixes
+
+- Correctly handle YAML files with no trailing newline
+  [weaveworks/flux#916](https://github.com/weaveworks/flux/issues/916)
+
+### Improvements
+
+The following improvements are to help if you are running a private
+registry.
+
+- Support image registries using basic authentication (rather than
+  token-based authentication)
+  [weaveworks/flux#915](https://github.com/weaveworks/flux/issues/915)
+- Introduce the daemon argument `--registry-insecure-host` for marking
+  a registry as accessible via HTTP (rather than HTTPS)
+  [weaveworks/flux#918](https://github.com/weaveworks/flux/pull/918)
+- Better logging of registry fetch failures, for troubleshooting
+  [weaveworks/flux#898](https://github.com/weaveworks/flux/pull/898)
+
 ## 1.2.1 (2018-01-15)
 
 ### Fixes

deploy/flux-deployment.yaml

@@ -24,7 +24,7 @@ spec:
         # There are no ":latest" images for flux. Find the most recent
         # release or image version at https://quay.io/weaveworks/flux
         # and replace the tag here.
-        image: quay.io/weaveworks/flux:1.2.1
+        image: quay.io/weaveworks/flux:1.2.2
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 3030 # informational

internal_docs/releasing.md

@@ -9,11 +9,13 @@ This process will create a new tagged release of flux, push dockerfiles and uplo
 
 1. Alter and commit the /CHANGELOG.md file to signify what has changed in this version.
 2. Ensure example deployment is up-to-date. (Check image tags)
-3. Create a new release: https://github.com/weaveworks/flux/releases/new
-4. Fill in the version number for the name and tag. The version number should conform to [semver](semver.org); i.e., look like `1.2.3` (NB: no leading 'v'); optionally with a pre-release suffix, e.g., `1.0.0-beta`
-5. Fill in the Description field (possibly a copy paste from the CHANGELOG.md)
-6. Click "Publish release"
-7. Add a new release to https://checkpoint-api.weave.works/admin
+3 Push that to a PR and have it reviewed.
+  3.1 Merge!
+4. Create a new release: https://github.com/weaveworks/flux/releases/new
+5. Fill in the version number for the name and tag. The version number should conform to [semver](semver.org); i.e., look like `1.2.3` (NB: no leading 'v'); optionally with a pre-release suffix, e.g., `1.0.0-beta`
+6. Fill in the Description field (possibly a copy paste from the CHANGELOG.md)
+7. Click "Publish release"
+8. Add a new release to https://checkpoint-api.weave.works/admin
 
 Circle will then run the build and upload the built binaries to the "Downloads" section of the release.