add pod static ip validate

kubeovn · Dec 6, 2020 · 2aecb3d · 2aecb3d
1 parent 27c5718
commit 2aecb3d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -376,6 +376,12 @@ func (c *Controller) handleAddPod(key string) error {
 		pod.Annotations[fmt.Sprintf(util.LogicalSwitchAnnotationTemplate, subnet.Spec.Provider)] = subnet.Name
 		pod.Annotations[fmt.Sprintf(util.AllocatedAnnotationTemplate, subnet.Spec.Provider)] = "true"
 
+		if err := util.ValidatePodCidr(subnet.Spec.CIDRBlock, ip); err != nil {
+			klog.Errorf("validate pod %s/%s failed, %v", namespace, name, err)
+			c.recorder.Eventf(pod, v1.EventTypeWarning, "ValidatePodNetworkFailed", err.Error())
+			return err
+		}
+
 		if isOvnSubnet(subnet) {
 			if subnet.Spec.Vlan != "" {
 				vlan, err := c.vlansLister.Get(subnet.Spec.Vlan)

diff --git a/pkg/util/validator.go b/pkg/util/validator.go
@@ -138,6 +138,17 @@ func ValidatePodNetwork(annotations map[string]string) error {
 	return nil
 }
 
+func ValidatePodCidr(cidrStr, ipStr string) error {
+	if SubnetBroadCast(cidrStr) == ipStr {
+		return fmt.Errorf("%s is the broadcast ip in cidr %s", ipStr, cidrStr)
+	}
+	if SubnetNumber(cidrStr) == ipStr {
+		return fmt.Errorf("%s is the network number ip in cidr %s", ipStr, cidrStr)
+	}
+
+	return nil
+}
+
 func ValidateVlan(vlan int, vlanRange string) error {
 	vlans := strings.Split(vlanRange, ",")
 	if len(vlans) != 2 {