fix: if cidr block not ends with zero, reformat it

(cherry picked from commit f8248ce)
kubeovn · Jan 2, 2020 · 8435a33 · 8435a33
1 parent 1f5df24
commit 8435a33
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -263,6 +263,14 @@ func (c *Controller) processNextDeleteSubnetWorkItem() bool {
 func formatSubnet(subnet *kubeovnv1.Subnet, c *Controller) error {
 	var err error
 	changed := false
+	_, ipNet, err := net.ParseCIDR(subnet.Spec.CIDRBlock)
+	if err != nil {
+		return fmt.Errorf("subnet %s cidr %s is not a valid cidrblock", subnet.Name, subnet.Spec.CIDRBlock )
+	}
+	if ipNet.String() != subnet.Spec.CIDRBlock {
+		subnet.Spec.CIDRBlock = ipNet.String()
+		changed = true
+	}
 	if subnet.Spec.Protocol == "" || subnet.Spec.Protocol != util.CheckProtocol(subnet.Spec.CIDRBlock) {
 		subnet.Spec.Protocol = util.CheckProtocol(subnet.Spec.CIDRBlock)
 		changed = true

diff --git a/pkg/daemon/controller.go b/pkg/daemon/controller.go
@@ -163,7 +163,12 @@ func (c *Controller) reconcileRouters() error {
 	}
 	cidrs := []string{}
 	for _, subnet := range subnets {
-		cidrs = append(cidrs, subnet.Spec.CIDRBlock)
+		_, ipNet, err := net.ParseCIDR(subnet.Spec.CIDRBlock)
+		if err != nil {
+			klog.Errorf("%s is not a valid cidr block", subnet.Spec.CIDRBlock)
+		} else {
+			cidrs = append(cidrs, ipNet.String())
+		}
 	}
 	node, err := c.config.KubeClient.CoreV1().Nodes().Get(c.config.NodeName, metav1.GetOptions{})
 	if err != nil {