removing the reliance on master.NetworkInfo.ClusterNetworkCIDR

Author: JacobTanenbaum

pkg/cmd/server/api/v1/conversions.go

@@ -95,8 +95,10 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
 
 			if noCloudProvider && len(obj.NetworkConfig.IngressIPNetworkCIDR) == 0 {
 				cidr := internal.DefaultIngressIPNetworkCIDR
-				if !(internal.CIDRsOverlap(cidr, obj.NetworkConfig.ClusterNetworkCIDR) || internal.CIDRsOverlap(cidr, obj.NetworkConfig.ServiceNetworkCIDR)) {
-					obj.NetworkConfig.IngressIPNetworkCIDR = cidr
+				for _, entry := range obj.NetworkConfig.ClusterNetworks {
+					if !(internal.CIDRsOverlap(cidr, entry.CIDR) || internal.CIDRsOverlap(cidr, obj.NetworkConfig.ServiceNetworkCIDR)) {
+						obj.NetworkConfig.IngressIPNetworkCIDR = cidr
+					}
 				}
 			}
 

pkg/cmd/server/api/validation/master.go

@@ -766,8 +766,10 @@ func ValidateIngressIPNetworkCIDR(config *api.MasterConfig, fldPath *field.Path)
 	noCloudProvider := kubeConfig != nil && (len(kubeConfig.ControllerArguments["cloud-provider"]) == 0 || kubeConfig.ControllerArguments["cloud-provider"][0] == "")
 
 	if noCloudProvider {
-		if api.CIDRsOverlap(cidr, config.NetworkConfig.ClusterNetworkCIDR) {
-			addError("conflicts with cluster network CIDR")
+		for _, entry := range config.NetworkConfig.ClusterNetworks {
+			if api.CIDRsOverlap(cidr, entry.CIDR) {
+				addError("conflicts with cluster network CIDR")
+			}
 		}
 		if api.CIDRsOverlap(cidr, config.NetworkConfig.ServiceNetworkCIDR) {
 			addError("conflicts with service network CIDR")