Skip to content

Commit a679f35

Browse files
JacobTanenbaumJacobTanenbaum
committed
changing /pkg/sdn/api and pkg/sdn/api/v1 types.go
changing from ClusterNetworkConfig ClusterNetworkCIDR to ClusterNetworks CIDR
1 parent 963e5c1 commit a679f35

File tree

6 files changed

+28
-27
lines changed

6 files changed

+28
-27
lines changed

‎pkg/cmd/cli/describe/printer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -998,9 +998,9 @@ func printNetNamespaceList(list *sdnapi.NetNamespaceList, w io.Writer, opts kpri
998998
func printClusterNetwork(n *sdnapi.ClusterNetwork, w io.Writer, opts kprinters.PrintOptions) error {
999999
var cidrList []string
10001000
name := formatResourceName(opts.Kind, n.Name, opts.WithKind)
1001-
for _, cidr := range n.ClusterDef {
1002-
cidrList = append(cidrList, cidr.ClusterNetworkCIDR)
1003-
_, err := fmt.Fprintf(w, "%s\t%s\t%d\t%s\t%s\n", name, cidr.ClusterNetworkCIDR, n.HostSubnetLength, n.ServiceNetwork, n.PluginName)
1001+
for _, cidr := range n.ClusterNetworks {
1002+
cidrList = append(cidrList, cidr.CIDR)
1003+
_, err := fmt.Fprintf(w, "%s\t%s\t%d\t%s\t%s\n", name, cidr.CIDR, n.HostSubnetLength, n.ServiceNetwork, n.PluginName)
10041004
if err != nil {
10051005
return err
10061006
}

‎pkg/sdn/api/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ type ClusterNetwork struct {
1616
metav1.ObjectMeta
1717

1818
Network string
19-
ClusterDef []ClusterNetworkEntry
19+
ClusterNetworks []ClusterNetworkEntry
2020
HostSubnetLength uint32
2121
ServiceNetwork string
2222
PluginName string
2323
}
2424

2525
type ClusterNetworkEntry struct {
26-
ClusterNetworkCIDR string
26+
CIDR string
2727
}
2828

2929
type ClusterNetworkList struct {

‎pkg/sdn/api/v1/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type ClusterNetwork struct {
2121
// Network is a CIDR string specifying the global overlay network's L3 space
2222
Network string `json:"network" protobuf:"bytes,2,opt,name=network"`
2323
// PLACEHOLDER
24-
ClusterDef []ClusterNetworkEntry `json:"clusterDef" protobuf:"bytes,6,rep,name=clusterDef"`
24+
ClusterNetworks []ClusterNetworkEntry `json:"clusterNetworks" protobuf:"bytes,6,rep,name=clusterNetworks"`
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
2626
HostSubnetLength uint32 `json:"hostsubnetlength" protobuf:"varint,3,opt,name=hostsubnetlength"`
2727
// ServiceNetwork is the CIDR range that Service IP addresses are allocated from
@@ -32,7 +32,7 @@ type ClusterNetwork struct {
3232

3333
// PLACEHOLDER
3434
type ClusterNetworkEntry struct {
35-
ClusterNetworkCIDR string `json:"clusterNetworkCIDR" protobuf:"bytes,1,opt,name=clusterNetworkCIDR"`
35+
CIDR string `json:"CIDR" protobuf:"bytes,1,opt,name=CIDR"`
3636
}
3737

3838
// ClusterNetworkList is a collection of ClusterNetworks

‎pkg/sdn/api/validation/validation.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ func intersect(cidr1, cidr2 string) bool {
3535
func ValidateClusterNetwork(clusterNet *sdnapi.ClusterNetwork) field.ErrorList {
3636
allErrs := validation.ValidateObjectMeta(&clusterNet.ObjectMeta, false, path.ValidatePathSegmentName, field.NewPath("metadata"))
3737

38-
if len(clusterNet.ClusterDef) == 0 {
39-
allErrs = append(allErrs, field.Invalid(field.NewPath("clusterDef"), clusterNet.ClusterDef, "empty"))
38+
if len(clusterNet.ClusterNetworks) == 0 {
39+
allErrs = append(allErrs, field.Invalid(field.NewPath("clusterNetworks"), clusterNet.ClusterNetworks, "empty"))
4040
}
41-
for index, cidr := range clusterNet.ClusterDef {
42-
clusterIPNet, err := netutils.ParseCIDRMask(cidr.ClusterNetworkCIDR)
41+
for index, cidr := range clusterNet.ClusterNetworks {
42+
clusterIPNet, err := netutils.ParseCIDRMask(cidr.CIDR)
4343
if err != nil {
44-
allErrs = append(allErrs, field.Invalid(field.NewPath("network"), clusterNet.Network, err.Error()))
44+
allErrs = append(allErrs, field.Invalid(field.NewPath("network"), cidr.CIDR, err.Error()))
4545
} else {
4646
maskLen, addrLen := clusterIPNet.Mask.Size()
4747
if clusterNet.HostSubnetLength > uint32(addrLen-maskLen) {
@@ -55,9 +55,10 @@ func ValidateClusterNetwork(clusterNet *sdnapi.ClusterNetwork) field.ErrorList {
5555
if err != nil {
5656
allErrs = append(allErrs, field.Invalid(field.NewPath("serviceNetwork"), clusterNet.ServiceNetwork, err.Error()))
5757
}
58-
for _, something := range clusterNet.ClusterDef[index+1:] {
59-
if intersect(cidr.ClusterNetworkCIDR, something.ClusterNetworkCIDR) {
60-
allErrs = append(allErrs, field.Invalid(field.NewPath("clusterNetworkCIDR"), clusterNet.ClusterDef, "two of the specified cidr addresses overlap"))
58+
for _, cidr_next := range clusterNet.ClusterNetworks[index+1:] {
59+
if intersect(cidr.CIDR, cidr_next.CIDR) {
60+
allErrs = append(allErrs, field.Invalid(field.NewPath("clusterNetworkCIDR"), clusterNet.ClusterNetworks, "two of the specified cidr addresses overlap"))
61+
6162
}
6263
}
6364
if (clusterIPNet != nil) && (serviceIPNet != nil) && clusterIPNet.Contains(serviceIPNet.IP) {
@@ -69,14 +70,14 @@ func ValidateClusterNetwork(clusterNet *sdnapi.ClusterNetwork) field.ErrorList {
6970
}
7071

7172
if clusterNet.Name == sdnapi.ClusterNetworkDefault && defaultClusterNetwork != nil {
72-
if len(clusterNet.ClusterDef) == len(defaultClusterNetwork.ClusterDef) {
73-
for index := range defaultClusterNetwork.ClusterDef {
74-
if clusterNet.ClusterDef[index] != defaultClusterNetwork.ClusterDef[index] {
75-
allErrs = append(allErrs, field.Invalid(field.NewPath("ClusterDef"), clusterNet.ClusterDef, "cannot change the default ClusterNetwork record via API"))
73+
if len(clusterNet.ClusterNetworks) == len(defaultClusterNetwork.ClusterNetworks){
74+
for index := range defaultClusterNetwork.ClusterNetworks {
75+
if clusterNet.ClusterNetworks[index] != defaultClusterNetwork.ClusterNetworks[index] {
76+
allErrs = append(allErrs, field.Invalid(field.NewPath("ClusterNetworks"), clusterNet.ClusterNetworks, "cannot change the default ClusterNetwork record via API"))
7677
}
7778
}
7879
} else {
79-
allErrs = append(allErrs, field.Invalid(field.NewPath("ClusterDef"), clusterNet.ClusterDef, "cannot change the default ClusterNetwork record via API"))
80+
allErrs = append(allErrs, field.Invalid(field.NewPath("ClusterDef"), clusterNet.ClusterNetworks, "cannot change the default ClusterNetwork record via API"))
8081
}
8182
// if clusterNet.Network != defaultClusterNetwork.Network {
8283
// allErrs = append(allErrs, field.Invalid(field.NewPath("network"), clusterNet.Network, "cannot change the default ClusterNetwork record via API."))

‎pkg/sdn/plugin/common.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ func parseNetworkInfo(clusterNetwork []osapi.ClusterNetworkEntry, serviceNetwork
5858
var cn []*net.IPNet
5959

6060
for _, entry := range clusterNetwork {
61-
clusterAddress, err := netutils.ParseCIDRMask(entry.ClusterNetworkCIDR)
61+
clusterAddress, err := netutils.ParseCIDRMask(entry.CIDR)
6262
if err != nil {
63-
_, clusterAddress, err := net.ParseCIDR(entry.ClusterNetworkCIDR)
63+
_, clusterAddress, err := net.ParseCIDR(entry.CIDR)
6464
if err != nil {
6565
return nil, fmt.Errorf("failed to parse ClusterNetwork CIDR %s: %v", clusterAddress, err)
6666
}
67-
glog.Errorf("Configured clusterNetworkCIDR value %q is invalid; treating it as %q", entry.ClusterNetworkCIDR, clusterAddress.String())
67+
glog.Errorf("Configured clusterNetworkCIDR value %q is invalid; treating it as %q", entry.CIDR, clusterAddress.String())
6868
}
6969
cn = append(cn, clusterAddress)
7070
}
@@ -174,7 +174,7 @@ func getNetworkInfo(osClient *osclient.Client) (*NetworkInfo, error) {
174174
return nil, err
175175
}
176176

177-
return parseNetworkInfo(cn.ClusterDef, cn.ServiceNetwork)
177+
return parseNetworkInfo(cn.ClusterNetworks, cn.ServiceNetwork)
178178
}
179179

180180
type ResourceName string

‎pkg/sdn/plugin/master.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclie
4949
var err error
5050
var clusterNetworkEntries []osapi.ClusterNetworkEntry
5151
for _, cidr := range networkConfig.ClusterNetworks {
52-
clusterNetworkEntries = append(clusterNetworkEntries, osapi.ClusterNetworkEntry{ClusterNetworkCIDR: cidr.CIDR})
52+
clusterNetworkEntries = append(clusterNetworkEntries, osapi.ClusterNetworkEntry{CIDR: cidr.CIDR})
5353
}
5454
master.networkInfo, err = parseNetworkInfo(clusterNetworkEntries, networkConfig.ServiceNetworkCIDR)
5555
if err != nil {
@@ -61,7 +61,7 @@ func StartMaster(networkConfig osconfigapi.MasterNetworkConfig, osClient *osclie
6161
ObjectMeta: metav1.ObjectMeta{Name: osapi.ClusterNetworkDefault},
6262

6363
// Network: networkConfig.ClusterNetworkCIDR,
64-
ClusterDef: clusterNetworkEntries,
64+
ClusterNetworks: clusterNetworkEntries,
6565
HostSubnetLength: networkConfig.HostSubnetLength,
6666
ServiceNetwork: networkConfig.ServiceNetworkCIDR,
6767
PluginName: networkConfig.NetworkPluginName,
@@ -150,7 +150,7 @@ func (master *OsdnMaster) checkClusterNetworkAgainstClusterObjects() error {
150150
func clusterNetworkChanged(obj *osapi.ClusterNetwork, old *osapi.ClusterNetwork) (bool, error) {
151151
changed := false
152152

153-
if !clusterDefEquals(old.ClusterDef, obj.ClusterDef) {
153+
if !clusterDefEquals(old.ClusterNetworks, obj.ClusterNetworks) {
154154
//KEYWORD
155155
//Not sure what to do here...
156156

0 commit comments

Comments
 (0)