Merge pull request #4079 from justinsb/validation_baremetal_no_subnet…

…_cidrs

Automatic merge from submit-queue.

validation: don't require subnet CIDRs on baremetal

pkg/apis/kops/validation/legacy.go

@@ -80,6 +80,7 @@ func ValidateCluster(c *kops.Cluster, strict bool) *field.Error {
 	switch kops.CloudProviderID(c.Spec.CloudProvider) {
 	case kops.CloudProviderBareMetal:
 		requiresSubnets = false
+		requiresSubnetCIDR = false
 		requiresNetworkCIDR = false
 		if c.Spec.NetworkCIDR != "" {
 			return field.Invalid(fieldSpec.Child("NetworkCIDR"), c.Spec.NetworkCIDR, "NetworkCIDR should not be set on bare metal")