Skip to content

Commit d2ddabe

Browse files
JacobTanenbaumJacobTanenbaum
committed
Allowing multiple CIDR addresses for allocation of Nodes
Chaning the Network Config section of the the master config to allow multiple CIDR addresses and hostsubnet Lengths for the allocation of nodes' address space
1 parent 4be6729 commit d2ddabe

32 files changed

+660
-329
lines changed

‎pkg/cmd/server/api/serialization_test.go

+21-1
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,33 @@ func fuzzInternalObject(t *testing.T, forVersion schema.GroupVersion, item runti
112112
obj.NetworkConfig.ServiceNetworkCIDR = "10.0.0.0/24"
113113
}
114114
}
115+
if len(obj.NetworkConfig.ClusterNetworks) == 0 {
116+
clusterNetwork := []configapi.ClusterNetworkEntry{
117+
{
118+
CIDR: "10.128.0.0/14",
119+
HostSubnetLength: 9,
120+
},
121+
}
122+
obj.NetworkConfig.ClusterNetworks = clusterNetwork
123+
}
115124

116125
// TODO stop duplicating the conversion in the test.
117126
kubeConfig := obj.KubernetesMasterConfig
118127
noCloudProvider := kubeConfig != nil && (len(kubeConfig.ControllerArguments["cloud-provider"]) == 0 || kubeConfig.ControllerArguments["cloud-provider"][0] == "")
119128
if noCloudProvider && len(obj.NetworkConfig.IngressIPNetworkCIDR) == 0 {
120129
cidr := configapi.DefaultIngressIPNetworkCIDR
121-
if !(configapi.CIDRsOverlap(cidr, obj.NetworkConfig.ClusterNetworkCIDR) || configapi.CIDRsOverlap(cidr, obj.NetworkConfig.ServiceNetworkCIDR)) {
130+
setCIDR := true
131+
if configapi.CIDRsOverlap(cidr, obj.NetworkConfig.ServiceNetworkCIDR) {
132+
setCIDR = false
133+
} else {
134+
for _, clusterNetwork := range obj.NetworkConfig.ClusterNetworks {
135+
if configapi.CIDRsOverlap(cidr, clusterNetwork.CIDR) {
136+
setCIDR = false
137+
break
138+
}
139+
}
140+
}
141+
if setCIDR {
122142
obj.NetworkConfig.IngressIPNetworkCIDR = cidr
123143
}
124144
}

‎pkg/cmd/server/api/types.go

+15-4
Original file line numberDiff line numberDiff line change
@@ -667,10 +667,12 @@ type UserAgentDenyRule struct {
667667

668668
// MasterNetworkConfig to be passed to the compiled in network plugin
669669
type MasterNetworkConfig struct {
670-
NetworkPluginName string
671-
ClusterNetworkCIDR string
672-
HostSubnetLength uint32
673-
ServiceNetworkCIDR string
670+
NetworkPluginName string
671+
DeprecatedClusterNetworkCIDR string
672+
// ClusterNetworks contains a list of cluster networks that defines the global overlay networks L3 space.
673+
ClusterNetworks []ClusterNetworkEntry
674+
DeprecatedHostSubnetLength uint32
675+
ServiceNetworkCIDR string
674676
// ExternalIPNetworkCIDRs controls what values are acceptable for the service external IP field. If empty, no externalIP
675677
// may be set. It may contain a list of CIDRs which are checked for access. If a CIDR is prefixed with !, IPs in that
676678
// CIDR will be rejected. Rejections will be applied first, then the IP checked against one of the allowed CIDRs. You
@@ -683,6 +685,15 @@ type MasterNetworkConfig struct {
683685
IngressIPNetworkCIDR string
684686
}
685687

688+
// ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs
689+
// reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.
690+
type ClusterNetworkEntry struct {
691+
// CIDR defines the total range of a cluster networks address space.
692+
CIDR string
693+
// HostSubnetLength gives the number of address bits reserved for pod IPs on each node.
694+
HostSubnetLength uint32
695+
}
696+
686697
type ImageConfig struct {
687698
// Format describes how to determine image names for system components
688699
Format string

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

+18-1
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,31 @@ func SetDefaults_MasterConfig(obj *MasterConfig) {
9090
obj.NetworkConfig.ServiceNetworkCIDR = "10.0.0.0/24"
9191
}
9292
}
93+
if len(obj.NetworkConfig.ClusterNetworks) == 0 {
94+
obj.NetworkConfig.ClusterNetworks = []ClusterNetworkEntry{{CIDR: obj.NetworkConfig.DeprecatedClusterNetworkCIDR, HostSubnetLength: obj.NetworkConfig.DeprecatedHostSubnetLength}}
95+
96+
obj.NetworkConfig.DeprecatedClusterNetworkCIDR = ""
97+
obj.NetworkConfig.DeprecatedHostSubnetLength = 0
98+
}
9399

94100
// TODO Detect cloud provider when not using built-in kubernetes
95101
kubeConfig := obj.KubernetesMasterConfig
96102
noCloudProvider := kubeConfig != nil && (len(kubeConfig.ControllerArguments["cloud-provider"]) == 0 || kubeConfig.ControllerArguments["cloud-provider"][0] == "")
97103

98104
if noCloudProvider && len(obj.NetworkConfig.IngressIPNetworkCIDR) == 0 {
99105
cidr := internal.DefaultIngressIPNetworkCIDR
100-
if !(internal.CIDRsOverlap(cidr, obj.NetworkConfig.ClusterNetworkCIDR) || internal.CIDRsOverlap(cidr, obj.NetworkConfig.ServiceNetworkCIDR)) {
106+
cidrOverlap := false
107+
if internal.CIDRsOverlap(cidr, obj.NetworkConfig.ServiceNetworkCIDR) {
108+
cidrOverlap = true
109+
} else {
110+
for _, entry := range obj.NetworkConfig.ClusterNetworks {
111+
if internal.CIDRsOverlap(cidr, entry.CIDR) {
112+
cidrOverlap = true
113+
break
114+
}
115+
}
116+
}
117+
if !cidrOverlap {
101118
obj.NetworkConfig.IngressIPNetworkCIDR = cidr
102119
}
103120
}

‎pkg/cmd/server/api/v1/types.go

+14-4
Original file line numberDiff line numberDiff line change
@@ -543,10 +543,12 @@ type RoutingConfig struct {
543543
type MasterNetworkConfig struct {
544544
// NetworkPluginName is the name of the network plugin to use
545545
NetworkPluginName string `json:"networkPluginName"`
546-
// ClusterNetworkCIDR is the CIDR string to specify the global overlay network's L3 space
547-
ClusterNetworkCIDR string `json:"clusterNetworkCIDR"`
548-
// HostSubnetLength is the number of bits to allocate to each host's subnet e.g. 8 would mean a /24 network on the host
549-
HostSubnetLength uint32 `json:"hostSubnetLength"`
546+
// ClusterNetworkCIDR is the CIDR string to specify the global overlay network's L3 space. Deprecated, but maintained for backwards compatibility, use ClusterNetworks instead.
547+
DeprecatedClusterNetworkCIDR string `json:"clusterNetworkCIDR,omitempty"`
548+
// ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from. If this is specified, then DeprecatedClusterNetworkCIDR and DeprecatedHostSubnetLength may not be set.
549+
ClusterNetworks []ClusterNetworkEntry `json:"clusterNetworks"`
550+
// HostSubnetLength is the number of bits to allocate to each host's subnet e.g. 8 would mean a /24 network on the host. Deprecated, but maintained for backwards compatibility, use ClusterNetworks instead.
551+
DeprecatedHostSubnetLength uint32 `json:"hostSubnetLength,omitempty"`
550552
// ServiceNetwork is the CIDR string to specify the service networks
551553
ServiceNetworkCIDR string `json:"serviceNetworkCIDR"`
552554
// ExternalIPNetworkCIDRs controls what values are acceptable for the service external IP field. If empty, no externalIP
@@ -561,6 +563,14 @@ type MasterNetworkConfig struct {
561563
IngressIPNetworkCIDR string `json:"ingressIPNetworkCIDR"`
562564
}
563565

566+
// ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.
567+
type ClusterNetworkEntry struct {
568+
// CIDR defines the total range of a cluster networks address space.
569+
CIDR string `json:"cidr"`
570+
// HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pod.
571+
HostSubnetLength uint32 `json:"hostSubnetLength"`
572+
}
573+
564574
// ImageConfig holds the necessary configuration options for building image names for system components
565575
type ImageConfig struct {
566576
// Format is the format of the name to be built for the system component

‎pkg/cmd/server/api/v1/types_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,8 @@ masterClients:
220220
openshiftLoopbackKubeConfig: ""
221221
masterPublicURL: ""
222222
networkConfig:
223-
clusterNetworkCIDR: ""
223+
clusterNetworks: null
224224
externalIPNetworkCIDRs: null
225-
hostSubnetLength: 0
226225
ingressIPNetworkCIDR: ""
227226
networkPluginName: ""
228227
serviceNetworkCIDR: ""

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

+17-2
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ func ValidateMasterConfig(config *api.MasterConfig, fldPath *field.Path) Validat
165165
}
166166

167167
validationResults.AddErrors(ValidateIngressIPNetworkCIDR(config, fldPath.Child("networkConfig", "ingressIPNetworkCIDR").Index(0))...)
168+
validationResults.Append(ValidateDeprecatedClusterNetworkConfig(config, fldPath.Child("networkConfig")))
168169

169170
validationResults.AddErrors(ValidateKubeConfig(config.MasterClients.OpenShiftLoopbackKubeConfig, fldPath.Child("masterClients", "openShiftLoopbackKubeConfig"))...)
170171

@@ -830,8 +831,10 @@ func ValidateIngressIPNetworkCIDR(config *api.MasterConfig, fldPath *field.Path)
830831
noCloudProvider := kubeConfig != nil && (len(kubeConfig.ControllerArguments["cloud-provider"]) == 0 || kubeConfig.ControllerArguments["cloud-provider"][0] == "")
831832

832833
if noCloudProvider {
833-
if api.CIDRsOverlap(cidr, config.NetworkConfig.ClusterNetworkCIDR) {
834-
addError("conflicts with cluster network CIDR")
834+
for _, entry := range config.NetworkConfig.ClusterNetworks {
835+
if api.CIDRsOverlap(cidr, entry.CIDR) {
836+
addError(fmt.Sprintf("conflicts with cluster network CIDR: %s", entry.CIDR))
837+
}
835838
}
836839
if api.CIDRsOverlap(cidr, config.NetworkConfig.ServiceNetworkCIDR) {
837840
addError("conflicts with service network CIDR")
@@ -842,3 +845,15 @@ func ValidateIngressIPNetworkCIDR(config *api.MasterConfig, fldPath *field.Path)
842845

843846
return
844847
}
848+
849+
func ValidateDeprecatedClusterNetworkConfig(config *api.MasterConfig, fldPath *field.Path) ValidationResults {
850+
validationResults := ValidationResults{}
851+
852+
if len(config.NetworkConfig.ClusterNetworks) > 0 && config.NetworkConfig.DeprecatedHostSubnetLength != 0 {
853+
validationResults.AddErrors(field.Invalid(fldPath.Child("hostSubnetLength"), config.NetworkConfig.DeprecatedHostSubnetLength, "cannot set hostSubnetLength and clusterNetworks, please use clusterNetworks"))
854+
}
855+
if len(config.NetworkConfig.ClusterNetworks) > 0 && config.NetworkConfig.DeprecatedClusterNetworkCIDR != "" {
856+
validationResults.AddErrors(field.Invalid(fldPath.Child("clusterNetworkCIDR"), config.NetworkConfig.DeprecatedClusterNetworkCIDR, "cannot set clusterNetworkCIDR and clusterNetworks, please use clusterNetworks"))
857+
}
858+
return validationResults
859+
}

‎pkg/cmd/server/api/validation/master_test.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,11 @@ func TestValidateIngressIPNetworkCIDR(t *testing.T) {
495495
NetworkConfig: configapi.MasterNetworkConfig{
496496
IngressIPNetworkCIDR: test.cidr,
497497
ServiceNetworkCIDR: test.serviceCIDR,
498-
ClusterNetworkCIDR: test.clusterCIDR,
498+
ClusterNetworks: []configapi.ClusterNetworkEntry{
499+
{
500+
CIDR: test.clusterCIDR,
501+
},
502+
},
499503
},
500504
}
501505
errors := ValidateIngressIPNetworkCIDR(config, nil)

‎pkg/cmd/server/origin/master_config.go

+6-1
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,12 @@ func newAdmissionChain(pluginNames []string, admissionConfigFilename string, plu
654654

655655
case serviceadmit.RestrictedEndpointsPluginName:
656656
// we need to set some customer parameters, so create by hand
657-
restrictedNetworks, err := serviceadmit.ParseSimpleCIDRRules([]string{options.NetworkConfig.ClusterNetworkCIDR, options.NetworkConfig.ServiceNetworkCIDR})
657+
var restricted []string
658+
restricted = append(restricted, options.NetworkConfig.ServiceNetworkCIDR)
659+
for _, cidr := range options.NetworkConfig.ClusterNetworks {
660+
restricted = append(restricted, cidr.CIDR)
661+
}
662+
restrictedNetworks, err := serviceadmit.ParseSimpleCIDRRules(restricted)
658663
if err != nil {
659664
// should have been caught with validation
660665
return nil, err

‎pkg/cmd/server/start/master_args.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,13 @@ func (args MasterArgs) BuildSerializeableMasterConfig() (*configapi.MasterConfig
294294
},
295295

296296
NetworkConfig: configapi.MasterNetworkConfig{
297-
NetworkPluginName: args.NetworkArgs.NetworkPluginName,
298-
ClusterNetworkCIDR: args.NetworkArgs.ClusterNetworkCIDR,
299-
HostSubnetLength: args.NetworkArgs.HostSubnetLength,
297+
NetworkPluginName: args.NetworkArgs.NetworkPluginName,
298+
ClusterNetworks: []configapi.ClusterNetworkEntry{
299+
{
300+
CIDR: args.NetworkArgs.ClusterNetworkCIDR,
301+
HostSubnetLength: args.NetworkArgs.HostSubnetLength,
302+
},
303+
},
300304
ServiceNetworkCIDR: args.NetworkArgs.ServiceNetworkCIDR,
301305
},
302306

‎pkg/network/apis/network/types.go

+6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,18 @@ type ClusterNetwork struct {
1717
metav1.TypeMeta
1818
metav1.ObjectMeta
1919

20+
ClusterNetworks []ClusterNetworkEntry
2021
Network string
2122
HostSubnetLength uint32
2223
ServiceNetwork string
2324
PluginName string
2425
}
2526

27+
type ClusterNetworkEntry struct {
28+
CIDR string
29+
HostSubnetLength uint32
30+
}
31+
2632
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
2733

2834
type ClusterNetworkList struct {

‎pkg/network/apis/network/v1/types.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,27 @@ type ClusterNetwork struct {
2121
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
2222

2323
// Network is a CIDR string specifying the global overlay network's L3 space
24-
Network string `json:"network" protobuf:"bytes,2,opt,name=network"`
24+
Network string `json:"network,omitempty" protobuf:"bytes,2,opt,name=network"`
2525
// HostSubnetLength is the number of bits of network to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods
26-
HostSubnetLength uint32 `json:"hostsubnetlength" protobuf:"varint,3,opt,name=hostsubnetlength"`
26+
HostSubnetLength uint32 `json:"hostsubnetlength,omitempty" protobuf:"varint,3,opt,name=hostsubnetlength"`
2727
// ServiceNetwork is the CIDR range that Service IP addresses are allocated from
2828
ServiceNetwork string `json:"serviceNetwork" protobuf:"bytes,4,opt,name=serviceNetwork"`
2929
// PluginName is the name of the network plugin being used
3030
PluginName string `json:"pluginName,omitempty" protobuf:"bytes,5,opt,name=pluginName"`
31+
// ClusterNetworks is a list of ClusterNetwork objects that defines the global overlay network's L3 space by specifying a set of CIDR and netmasks that the SDN can allocate addressed from. If this is specified, then DeprecatedClusterNetworkCIDR and DeprecatedHostSubnetLength may not be set.
32+
ClusterNetworks []ClusterNetworkEntry `json:"clusterNetworks" protobuf:"bytes,6,rep,name=clusterNetworks"`
3133
}
3234

3335
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
3436

37+
// ClusterNetworkEntry defines an individual cluster network. The CIDRs cannot overlap with other cluster network CIDRs, CIDRs reserved for external ips, CIDRs reserved for service networks, and CIDRs reserved for ingress ips.
38+
type ClusterNetworkEntry struct {
39+
// CIDR defines the total range of a cluster networks address space.
40+
CIDR string `json:"CIDR" protobuf:"bytes,1,opt,name=cidr"`
41+
// HostSubnetLength is the number of bits of the accompanying CIDR address to allocate to each node. eg, 8 would mean that each node would have a /24 slice of the overlay network for its pods.
42+
HostSubnetLength uint32 `json:"hostSubnetLength" protobuf:"varint,2,opt,name=hostSubnetLength"`
43+
}
44+
3545
// ClusterNetworkList is a collection of ClusterNetworks
3646
type ClusterNetworkList struct {
3747
metav1.TypeMeta `json:",inline"`

‎pkg/network/apis/network/validation/validation.go

+43-14
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ package validation
33
import (
44
"fmt"
55
"net"
6+
"reflect"
67

78
"k8s.io/apimachinery/pkg/api/validation/path"
89
utilvalidation "k8s.io/apimachinery/pkg/util/validation"
910
"k8s.io/apimachinery/pkg/util/validation/field"
1011
"k8s.io/kubernetes/pkg/api/validation"
1112

13+
configapi "github.com/openshift/origin/pkg/cmd/server/api"
1214
"github.com/openshift/origin/pkg/network"
1315
networkapi "github.com/openshift/origin/pkg/network/apis/network"
1416
"github.com/openshift/origin/pkg/util/netutils"
@@ -24,29 +26,53 @@ func SetDefaultClusterNetwork(cn networkapi.ClusterNetwork) {
2426
// ValidateClusterNetwork tests if required fields in the ClusterNetwork are set, and ensures that the "default" ClusterNetwork can only be set to the correct values
2527
func ValidateClusterNetwork(clusterNet *networkapi.ClusterNetwork) field.ErrorList {
2628
allErrs := validation.ValidateObjectMeta(&clusterNet.ObjectMeta, false, path.ValidatePathSegmentName, field.NewPath("metadata"))
29+
var testedCIDRS []*net.IPNet
2730

28-
clusterIPNet, err := netutils.ParseCIDRMask(clusterNet.Network)
29-
if err != nil {
30-
allErrs = append(allErrs, field.Invalid(field.NewPath("network"), clusterNet.Network, err.Error()))
31-
} else {
32-
maskLen, addrLen := clusterIPNet.Mask.Size()
33-
if clusterNet.HostSubnetLength > uint32(addrLen-maskLen) {
34-
allErrs = append(allErrs, field.Invalid(field.NewPath("hostSubnetLength"), clusterNet.HostSubnetLength, "subnet length is too large for clusterNetwork"))
35-
} else if clusterNet.HostSubnetLength < 2 {
36-
allErrs = append(allErrs, field.Invalid(field.NewPath("hostSubnetLength"), clusterNet.HostSubnetLength, "subnet length must be at least 2"))
31+
if len(clusterNet.Network) != 0 || clusterNet.HostSubnetLength != 0 {
32+
//In the case that a user manually makes a clusterNetwork object with clusterNet.Network and clusterNet.HostubnetLength at least make sure they are valid values
33+
clusterIPNet, err := netutils.ParseCIDRMask(clusterNet.Network)
34+
if err != nil {
35+
allErrs = append(allErrs, field.Invalid(field.NewPath("network"), clusterNet.Network, err.Error()))
36+
} else {
37+
maskLen, addrLen := clusterIPNet.Mask.Size()
38+
if clusterNet.HostSubnetLength > uint32(addrLen-maskLen) {
39+
allErrs = append(allErrs, field.Invalid(field.NewPath("hostSubnetLength"), clusterNet.HostSubnetLength, "subnet length is too large for clusterNetwork"))
40+
} else if clusterNet.HostSubnetLength < 2 {
41+
allErrs = append(allErrs, field.Invalid(field.NewPath("hostSubnetLength"), clusterNet.HostSubnetLength, "subnet length must be at least 2"))
42+
}
3743
}
3844
}
3945

46+
if len(clusterNet.ClusterNetworks) == 0 && len(clusterNet.Network) == 0 {
47+
allErrs = append(allErrs, field.Invalid(field.NewPath("clusterNetworks"), clusterNet.ClusterNetworks, "must have at least one cluster network CIDR"))
48+
}
4049
serviceIPNet, err := netutils.ParseCIDRMask(clusterNet.ServiceNetwork)
4150
if err != nil {
4251
allErrs = append(allErrs, field.Invalid(field.NewPath("serviceNetwork"), clusterNet.ServiceNetwork, err.Error()))
4352
}
53+
for i, cn := range clusterNet.ClusterNetworks {
54+
clusterIPNet, err := netutils.ParseCIDRMask(cn.CIDR)
55+
if err != nil {
56+
allErrs = append(allErrs, field.Invalid(field.NewPath("clusterNetworks").Index(i).Child("cidr"), cn.CIDR, err.Error()))
57+
continue
58+
}
59+
maskLen, addrLen := clusterIPNet.Mask.Size()
60+
if cn.HostSubnetLength > uint32(addrLen-maskLen) {
61+
allErrs = append(allErrs, field.Invalid(field.NewPath("clusterNetworks").Index(i).Child("hostSubnetLength"), cn.HostSubnetLength, "subnet length is too large for clusterNetwork "))
62+
} else if cn.HostSubnetLength < 2 {
63+
allErrs = append(allErrs, field.Invalid(field.NewPath("clusterNetworks").Index(i).Child("hostSubnetLength"), cn.HostSubnetLength, "subnet length must be at least 2"))
64+
}
4465

45-
if (clusterIPNet != nil) && (serviceIPNet != nil) && clusterIPNet.Contains(serviceIPNet.IP) {
46-
allErrs = append(allErrs, field.Invalid(field.NewPath("serviceNetwork"), clusterNet.ServiceNetwork, "service network overlaps with cluster network"))
47-
}
48-
if (serviceIPNet != nil) && (clusterIPNet != nil) && serviceIPNet.Contains(clusterIPNet.IP) {
49-
allErrs = append(allErrs, field.Invalid(field.NewPath("network"), clusterNet.Network, "cluster network overlaps with service network"))
66+
for _, cidr := range testedCIDRS {
67+
if configapi.CIDRsOverlap(clusterIPNet.String(), cidr.String()) {
68+
allErrs = append(allErrs, field.Invalid(field.NewPath("clusterNetworks").Index(i).Child("cidr"), cn.CIDR, fmt.Sprintf("cidr range overlaps with another cidr %q", cidr.String())))
69+
}
70+
}
71+
testedCIDRS = append(testedCIDRS, clusterIPNet)
72+
73+
if (clusterIPNet != nil) && (serviceIPNet != nil) && configapi.CIDRsOverlap(clusterIPNet.String(), serviceIPNet.String()) {
74+
allErrs = append(allErrs, field.Invalid(field.NewPath("serviceNetwork"), clusterNet.ServiceNetwork, fmt.Sprintf("service network overlaps with cluster network cidr: %s", clusterIPNet.String())))
75+
}
5076
}
5177

5278
if clusterNet.Name == networkapi.ClusterNetworkDefault && defaultClusterNetwork != nil {
@@ -56,6 +82,9 @@ func ValidateClusterNetwork(clusterNet *networkapi.ClusterNetwork) field.ErrorLi
5682
if clusterNet.HostSubnetLength != defaultClusterNetwork.HostSubnetLength {
5783
allErrs = append(allErrs, field.Invalid(field.NewPath("hostSubnetLength"), clusterNet.HostSubnetLength, "cannot change the default ClusterNetwork record via API."))
5884
}
85+
if !reflect.DeepEqual(clusterNet.ClusterNetworks, defaultClusterNetwork.ClusterNetworks) {
86+
allErrs = append(allErrs, field.Invalid(field.NewPath("ClusterNetworks"), clusterNet.ClusterNetworks, "cannot change the default ClusterNetwork record via API"))
87+
}
5988
if clusterNet.ServiceNetwork != defaultClusterNetwork.ServiceNetwork {
6089
allErrs = append(allErrs, field.Invalid(field.NewPath("serviceNetwork"), clusterNet.ServiceNetwork, "cannot change the default ClusterNetwork record via API."))
6190
}

0 commit comments

Comments
 (0)