kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AllocateNodeCIDRs need no longer be "bubbled down" 

We have it on the KCM config; just set it there
This commit is contained in:
Justin Santa Barbara 2016-06-27 00:32:19 -04:00
parent 944900153f
commit b6cf38c96e
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
upup/models/cloudup/defaults.options
View File

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

2
upup/pkg/api/cluster.go
View File

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

3
upup/pkg/api/registry.go
View File

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

2
upup/pkg/kutil/export_cluster.go
View File

@ -142,7 +142,7 @@ func (x *ExportCluster) ReverseAWS() error {
// k8s.ImageId = "" // k8s.ImageId = ""
//clusterConfig.ClusterIPRange = conf.Settings["CLUSTER_IP_RANGE"] //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"] //clusterConfig.KubeUser = conf.Settings["KUBE_USER"]
cluster.Spec.ServiceClusterIPRange = conf.Settings["SERVICE_CLUSTER_IP_RANGE"] cluster.Spec.ServiceClusterIPRange = conf.Settings["SERVICE_CLUSTER_IP_RANGE"]
//clusterConfig.EnableClusterMonitoring = conf.Settings["ENABLE_CLUSTER_MONITORING"] //clusterConfig.EnableClusterMonitoring = conf.Settings["ENABLE_CLUSTER_MONITORING"]