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

Backport the backport

This commit is contained in:
Kris Childress 2016-12-25 18:56:26 -07:00
parent 9751746415
commit c3c0322712
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/apis/kops/cluster.go
View File

@ -314,6 +314,11 @@ func (c *Cluster) FillDefaults() error {
c.Spec.SSHAccess = append(c.Spec.SSHAccess, "0.0.0.0/0")
}
// Topology support
if c.Spec.Topology == nil {
c.Spec.Topology = &TopologySpec{Masters: TopologyPublic, Nodes: TopologyPublic}
}
if len(c.Spec.KubernetesAPIAccess) == 0 {
c.Spec.KubernetesAPIAccess = append(c.Spec.KubernetesAPIAccess, "0.0.0.0/0")
}

5
pkg/apis/kops/validation.go
View File

@ -303,6 +303,11 @@ func (c *Cluster) Validate(strict bool) error {
}
}
// Topology support
if c.Spec.Topology == nil {
c.Spec.Topology = &TopologySpec{Masters: TopologyPublic, Nodes: TopologyPublic}
}
if c.Spec.Topology.Masters != "" && c.Spec.Topology.Nodes != "" {
if c.Spec.Topology.Masters != TopologyPublic && c.Spec.Topology.Masters != TopologyPrivate {
return fmt.Errorf("Invalid Masters value for Topology")