Squash release notes for v1.8.x

docs/releases/1.8-NOTES.md

@@ -1,5 +1,16 @@
+# 1.8.1
 
-# Significant changes
+Small patch release, which updates network plugins, but also tolerates a new schema file that will be added in kops 1.9.0.  This will provide a downgrade option from kops 1.9.0.
+
+* Ignore keyset.yaml files; provide a downgrade option from (upcoming) kops 1.9.0
+* Update flannel, weave, romana, kopeio-networking, calico, canal
+* Stop passing deprecated require-kubeconfig flag for kubernetes >= 1.9
+
+---
+
+# 1.8.0
+
+## Significant changes
 
 * flannel now has a `backend` property in the manifest, which can be either `udp` or `vxlan`.  `udp`
   is not recommended, but will be the default value for existing clusters or clusters created via manifests.
@@ -21,7 +32,7 @@
 
 * Includes fix for kube-dns CVE-2017-14491 (was also included in kops 1.7.1)
 
-# Required Actions
+## Required Actions
 
 * Existing Calico users on clusters that were created prior to kops 1.8.0
   need to be updated for the new "DefaultDeny" behavior for Kubernetes NetworkPolicies.
@@ -36,7 +47,7 @@
   5. Confirm cluster is back up and all canal pods are running successfully: `kops validate cluster` (this may take a few minutes for the cluster to fully validate)
   6. Delete the upgrade job as it is no longer required: `kubectl delete job calico-upgrade-v2.5` (you can also safely delete the `clusterrole`, `clusterrolebinding` and `serviceaccount` resources that were created by the above manifest file)
 
-# Highlighted changes
+## Highlighted changes
 
 * Support for etcd3 for new clusters, also allow etcd TLS to be enabled for new clusters.  etcd peer port is also locked down.
 
@@ -109,7 +120,7 @@ or specify a different network (current using `--vpc` flag)
 * building code using bazel
 
 
-# All PRs
+## All PRs
 
 
 ### to beta.1

docs/releases/1.8.1.md

@@ -1,6 +0,0 @@
-Release 1.8.1 is a small patch release, which updates network plugins, but also tolerates a new schema
-file that will be added in kops 1.9.0.  This will provide a downgrade option from kops 1.9.0.
-
-* Ignore keyset.yaml files; provide a downgrade option from (upcoming) kops 1.9.0
-* Update flannel, weave, romana, kopeio-networking, calico, canal
-* Stop passing deprecated require-kubeconfig flag for kubernetes >= 1.9

mkdocs.yml

@@ -158,7 +158,6 @@ nav:
     - "1.11": releases/1.11-NOTES.md
     - "1.10": releases/1.10-NOTES.md
     - "1.9": releases/1.9-NOTES.md
-    - "1.8.1": releases/1.8.1.md
     - "1.8": releases/1.8-NOTES.md
     - "1.7.1": releases/1.7.1.md
     - "1.7": releases/1.7-NOTES.md