AllocateNodeCIDRs need no longer be "bubbled down"

We have it on the KCM config; just set it there

upup/models/cloudup/defaults.options

@@ -1,5 +1,4 @@
 #InstancePrefix: kubernetes
-AllocateNodeCIDRs: true
 Multizone: true
 
 ServiceClusterIPRange: 10.0.0.0/16

upup/pkg/api/cluster.go

@@ -67,7 +67,7 @@ type ClusterSpec struct {
 	// ClusterName is a unique identifier for the cluster, and currently must be a DNS name
 	//ClusterName       string `json:",omitempty"`
 
-	AllocateNodeCIDRs *bool `json:"allocateNodeCIDRs,omitempty"`
+	//AllocateNodeCIDRs *bool `json:"allocateNodeCIDRs,omitempty"`
 
 	Multizone *bool `json:"mutlizone,omitempty"`
 

upup/pkg/api/registry.go

@@ -30,6 +30,9 @@ func WriteConfig(stateStore fi.StateStore, cluster *Cluster, groups []*InstanceG
 	}
 
 	for _, ns := range groups {
+		if ns.CreationTimestamp.IsZero() {
+			ns.CreationTimestamp = unversioned.NewTime(time.Now().UTC())
+		}
 		err = stateStore.WriteConfig("instancegroup/"+ns.Name, ns)
 		if err != nil {
 			return fmt.Errorf("error writing updated instancegroup configuration: %v", err)

upup/pkg/kutil/export_cluster.go

@@ -142,7 +142,7 @@ func (x *ExportCluster) ReverseAWS() error {
 	// k8s.ImageId = ""
 
 	//clusterConfig.ClusterIPRange = conf.Settings["CLUSTER_IP_RANGE"]
-	cluster.Spec.AllocateNodeCIDRs = conf.ParseBool("ALLOCATE_NODE_CIDRS")
+	cluster.Spec.KubeControllerManager.AllocateNodeCIDRs = conf.ParseBool("ALLOCATE_NODE_CIDRS")
 	//clusterConfig.KubeUser = conf.Settings["KUBE_USER"]
 	cluster.Spec.ServiceClusterIPRange = conf.Settings["SERVICE_CLUSTER_IP_RANGE"]
 	//clusterConfig.EnableClusterMonitoring = conf.Settings["ENABLE_CLUSTER_MONITORING"]