Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

baremetal: relax validation on subnets & networking #3301

Merged
merged 1 commit into from
Aug 29, 2017
Merged

baremetal: relax validation on subnets & networking #3301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/apis/kops/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ func FindKopsVersionSpec(versions []KopsVersionSpec, version semver.Version) *Ko
type CloudProviderID string

const CloudProviderAWS CloudProviderID = "aws"
const CloudProviderBareMetal CloudProviderID = "baremetal"
const CloudProviderGCE CloudProviderID = "gce"
const CloudProviderDO CloudProviderID = "digitalocean"
const CloudProviderVSphere CloudProviderID = "vsphere"
Expand Down
39 changes: 31 additions & 8 deletions pkg/apis/kops/validation/legacy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,27 @@ func ValidateCluster(c *kops.Cluster, strict bool) *field.Error {
}
}

if len(c.Spec.Subnets) == 0 {
if c.Spec.CloudProvider == "" {
return field.Required(fieldSpec.Child("CloudProvider"), "")
}

requiresSubnets := true
requiresNetworkCIDR := true
switch kops.CloudProviderID(c.Spec.CloudProvider) {
case kops.CloudProviderBareMetal:
requiresSubnets = false
requiresNetworkCIDR = false

case kops.CloudProviderDO:
case kops.CloudProviderAWS:
case kops.CloudProviderGCE:
case kops.CloudProviderVSphere:

default:
return field.Invalid(fieldSpec.Child("CloudProvider"), c.Spec.CloudProvider, "CloudProvider not recognized")
}

if requiresSubnets && len(c.Spec.Subnets) == 0 {
// TODO: Auto choose zones from region?
return field.Required(fieldSpec.Child("Subnets"), "must configure at least one Subnet (use --zones)")
}
Expand Down Expand Up @@ -105,11 +125,14 @@ func ValidateCluster(c *kops.Cluster, strict bool) *field.Error {
{
networkCIDRString := c.Spec.NetworkCIDR
if networkCIDRString == "" {
return field.Required(fieldSpec.Child("NetworkCIDR"), "Cluster did not have NetworkCIDR set")
}
_, networkCIDR, err = net.ParseCIDR(networkCIDRString)
if err != nil {
return field.Invalid(fieldSpec.Child("NetworkCIDR"), networkCIDRString, fmt.Sprintf("Cluster had an invalid NetworkCIDR"))
if requiresNetworkCIDR {
return field.Required(fieldSpec.Child("NetworkCIDR"), "Cluster did not have NetworkCIDR set")
}
} else {
_, networkCIDR, err = net.ParseCIDR(networkCIDRString)
if err != nil {
return field.Invalid(fieldSpec.Child("NetworkCIDR"), networkCIDRString, fmt.Sprintf("Cluster had an invalid NetworkCIDR"))
}
}
}

Expand All @@ -125,7 +148,7 @@ func ValidateCluster(c *kops.Cluster, strict bool) *field.Error {
return field.Invalid(fieldSpec.Child("NonMasqueradeCIDR"), nonMasqueradeCIDRString, "Cluster had an invalid NonMasqueradeCIDR")
}

if subnetsOverlap(nonMasqueradeCIDR, networkCIDR) {
if networkCIDR != nil && subnetsOverlap(nonMasqueradeCIDR, networkCIDR) {
return field.Invalid(fieldSpec.Child("NonMasqueradeCIDR"), nonMasqueradeCIDRString, fmt.Sprintf("NonMasqueradeCIDR %q cannot overlap with NetworkCIDR %q", nonMasqueradeCIDRString, c.Spec.NetworkCIDR))
}

Expand Down Expand Up @@ -260,7 +283,7 @@ func ValidateCluster(c *kops.Cluster, strict bool) *field.Error {
return field.Invalid(fieldSubnet.Child("CIDR"), s.CIDR, "Subnet had an invalid CIDR")
}

if !isSubnet(networkCIDR, subnetCIDR) {
if networkCIDR != nil && !isSubnet(networkCIDR, subnetCIDR) {
return field.Invalid(fieldSubnet.Child("CIDR"), s.CIDR, fmt.Sprintf("Subnet %q had a CIDR %q that was not a subnet of the NetworkCIDR %q", s.Name, s.CIDR, c.Spec.NetworkCIDR))
}
}
Expand Down