Update roadmap for 1.7

ROADMAP.md

@@ -1,25 +1,5 @@
 # ROADMAP
 
-# 1.6
-
-## Must-have features
-
-* Support for k8s 1.6
-* RBAC enabled by default
-* etcd version selection (probably etcd3 by default for new clusters, etcd3 upgrade easy)
-
-## Other features we are working on in the 1.6 timeframe
-
-* Support for GCE
-* Support for Google's [Container Optimized OS](https://cloud.google.com/container-optimized-os) (formerly known as GCI)
-* Some support for bare-metal
-* Some support for more cloud providers
-* Some IAM integration
-* Federation made easy
-* Authentication made easy
-* Integration with kubeadm
-* CloudFormation integration on AWS
-
 # 1.7
 
 ## Must-have features
@@ -28,4 +8,34 @@
  
 ## Other features we are working on in the 1.7 timeframe
 
+* etcd controller to allow moving between versions
 * kops server for better team scenarios
+* support for bare-metal
+* more gossip backends
+* IAM integration
+* more cloud providers
+* promote GCE to stable
+* RBAC policies for all components
+
+# HISTORICAL
+
+## 1.6
+
+### Must-have features
+
+* Support for k8s 1.6
+* RBAC enabled by default _we made RBAC optional_
+
+## Other features we are working on in the 1.6 timeframe
+
+* Support for GCE _alpha_
+* Support for Google's [Container Optimized OS](https://cloud.google.com/container-optimized-os) (formerly known as GCI) _alpha_
+* Some support for bare-metal _private branches, not merged_
+* Some support for more cloud providers _initial work on vsphere_
+* Some IAM integration _discussions, but no code_
+* Federation made easy _no progress_
+* Authentication made easy _no progress_
+* Integration with kubeadm _kops now uses kubeadm for some RBAC related functionality_
+* CloudFormation integration on AWS _beta_
+
+