check if subnet cidr is correct (#2136)

kubeovn · Dec 7, 2022 · 2156ef0 · 2156ef0
1 parent f58c88f
commit 2156ef0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pkg/util/validator.go b/pkg/util/validator.go
@@ -47,6 +47,12 @@ func ValidateSubnet(subnet kubeovnv1.Subnet) error {
 		}
 	}
 
+	for _, cidr := range strings.Split(subnet.Spec.CIDRBlock, ",") {
+		if _, _, err := net.ParseCIDR(cidr); err != nil {
+			return fmt.Errorf("subnet %s cidr %s is invalid", subnet.Name, cidr)
+		}
+	}
+
 	allow := subnet.Spec.AllowSubnets
 	for _, cidr := range allow {
 		if _, _, err := net.ParseCIDR(cidr); err != nil {

diff --git a/pkg/webhook/webhook.go b/pkg/webhook/webhook.go
@@ -48,7 +48,6 @@ func NewValidatingHook(c cache.Cache) (*ValidatingHook, error) {
 	updateHooks[subnetGVK] = v.SubnetUpdateHook
 
 	deleteHooks[subnetGVK] = v.SubnetDeleteHook
-
 	deleteHooks[vpcGVK] = v.VpcDeleteHook
 
 	return v, nil

diff --git a/yamls/webhook.yaml b/yamls/webhook.yaml
@@ -33,7 +33,7 @@ spec:
       hostNetwork: true
       containers:
         - name: kube-ovn-webhook
-          image: "kubeovn/kube-ovn:v1.10.0"
+          image: "kubeovn/kube-ovn:v1.11.0"
           imagePullPolicy: IfNotPresent
           command:
             - /kube-ovn/kube-ovn-webhook