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

Merge pull request #965 from DualSpark/patch-panic-validation 

Adding backwards support for non-topology validation
This commit is contained in:
Chris Love 2016-11-21 07:55:52 -07:00 committed by GitHub
parent 9e1b3dce55 379a8c8c71
commit 4308340ed2
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -293,6 +293,18 @@ func (c *Cluster) Validate(strict bool) error {
} }
// Topology support // Topology support
if c.Spec.Topology == nil {
// This is a case of an older cluster making changes with newer code.. Adding this in for backwards
// compatibility.. Putting this in validation because it can be called from a few places in the code
// base.. all of which make the assumption that the validation should work for their current
// representation of the cluster..
// @kris-nova
// #960
// #943
c.Spec.Topology = &TopologySpec{Masters: TopologyPublic, Nodes: TopologyPublic}
}
if c.Spec.Topology.Masters != "" && c.Spec.Topology.Nodes != "" { if c.Spec.Topology.Masters != "" && c.Spec.Topology.Nodes != "" {
if c.Spec.Topology.Masters != TopologyPublic && c.Spec.Topology.Masters != TopologyPrivate { if c.Spec.Topology.Masters != TopologyPublic && c.Spec.Topology.Masters != TopologyPrivate {
return fmt.Errorf("Invalid Masters value for Topology") return fmt.Errorf("Invalid Masters value for Topology")