Browse code

Merge pull request #12379 from marun/fix-default-ingress-cidr

Merged by openshift-bot

OpenShift Bot authored on 2017/01/05 08:49:01
Showing 4 changed files
... ...
@@ -104,7 +104,7 @@ func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item
104 104
 			kubeConfig := obj.KubernetesMasterConfig
105 105
 			noCloudProvider := kubeConfig != nil && (len(kubeConfig.ControllerArguments["cloud-provider"]) == 0 || kubeConfig.ControllerArguments["cloud-provider"][0] == "")
106 106
 			if noCloudProvider && len(obj.NetworkConfig.IngressIPNetworkCIDR) == 0 {
107
-				cidr := "172.46.0.0/16"
107
+				cidr := configapi.DefaultIngressIPNetworkCIDR
108 108
 				if !(configapi.CIDRsOverlap(cidr, obj.NetworkConfig.ClusterNetworkCIDR) || configapi.CIDRsOverlap(cidr, obj.NetworkConfig.ServiceNetworkCIDR)) {
109 109
 					obj.NetworkConfig.IngressIPNetworkCIDR = cidr
110 110
 				}
... ...
@@ -16,6 +16,10 @@ const (
16 16
 	AllVersions = "*"
17 17
 )
18 18
 
19
+const (
20
+	DefaultIngressIPNetworkCIDR = "172.29.0.0/16"
21
+)
22
+
19 23
 var (
20 24
 	KnownKubernetesAPILevels   = []string{"v1beta1", "v1beta2", "v1beta3", "v1"}
21 25
 	KnownOpenShiftAPILevels    = []string{"v1beta1", "v1beta3", "v1"}
... ...
@@ -86,7 +86,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
86 86
 			noCloudProvider := kubeConfig != nil && (len(kubeConfig.ControllerArguments["cloud-provider"]) == 0 || kubeConfig.ControllerArguments["cloud-provider"][0] == "")
87 87
 
88 88
 			if noCloudProvider && len(obj.NetworkConfig.IngressIPNetworkCIDR) == 0 {
89
-				cidr := "172.46.0.0/16"
89
+				cidr := internal.DefaultIngressIPNetworkCIDR
90 90
 				if !(internal.CIDRsOverlap(cidr, obj.NetworkConfig.ClusterNetworkCIDR) || internal.CIDRsOverlap(cidr, obj.NetworkConfig.ServiceNetworkCIDR)) {
91 91
 					obj.NetworkConfig.IngressIPNetworkCIDR = cidr
92 92
 				}
... ...
@@ -672,7 +672,7 @@ func ValidateIngressIPNetworkCIDR(config *api.MasterConfig, fldPath *field.Path)
672 672
 
673 673
 	_, ipNet, err := net.ParseCIDR(cidr)
674 674
 	if err != nil {
675
-		addError("must be a valid CIDR notation IP range (e.g. 172.46.0.0/16)")
675
+		addError(fmt.Sprintf("must be a valid CIDR notation IP range (e.g. %s)", api.DefaultIngressIPNetworkCIDR))
676 676
 		return
677 677
 	}
678 678