Merge pull request #3495 from justinsb/split_out_baremetal_no_network…

…cidr Automatic merge from submit-queue. baremetal: error if NetworkCIDR set
kubernetes · Sep 30, 2017 · 1e9010d · 1e9010d
2 parents ea31478 + b32e6b5
commit 1e9010d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/apis/kops/validation/legacy.go b/pkg/apis/kops/validation/legacy.go
@@ -79,6 +79,9 @@ func ValidateCluster(c *kops.Cluster, strict bool) *field.Error {
 	switch kops.CloudProviderID(c.Spec.CloudProvider) {
 	case kops.CloudProviderBareMetal:
 		requiresSubnets = false
+		if c.Spec.NetworkCIDR != "" {
+			return field.Invalid(fieldSpec.Child("NetworkCIDR"), c.Spec.NetworkCIDR, "NetworkCIDR should not be set on bare metal")
+		}
 		requiresNetworkCIDR = false
 
 	case kops.CloudProviderDO: