adding IP Protocol enumeration to CRD can reduce the kube-ovn Control…

…ler judgment logic (#1391)
kubeovn · Mar 22, 2022 · 7bd25c6 · 7bd25c6
1 parent dcc7971
commit 7bd25c6
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 1 deletion.
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -573,6 +573,10 @@ spec:
                   type: boolean
                 protocol:
                   type: string
+                  enum:
+                    - IPv4
+                    - IPv6
+                    - Dual
                 cidrBlock:
                   type: string
                 namespaces:

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -291,7 +291,7 @@ func formatSubnet(subnet *kubeovnv1.Subnet, c *Controller) error {
 		changed = true
 	}
 	newCIDRBlock := subnet.Spec.CIDRBlock
-	if subnet.Spec.Protocol == "" || subnet.Spec.Protocol != util.CheckProtocol(newCIDRBlock) {
+	if subnet.Spec.Protocol != util.CheckProtocol(newCIDRBlock) {
 		subnet.Spec.Protocol = util.CheckProtocol(subnet.Spec.CIDRBlock)
 		changed = true
 	}

diff --git a/test/e2e-ebpf/e2e_ebpf_suite_test.go b/test/e2e-ebpf/e2e_ebpf_suite_test.go
@@ -86,6 +86,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 		Spec: kubeovn.SubnetSpec{
 			CIDRBlock:  "12.10.0.0/16",
 			Namespaces: []string{namespace},
+			Protocol:   util.CheckProtocol("12.10.0.0/16"),
 		},
 	}
 	_, err = f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), &s, metav1.CreateOptions{})

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -125,6 +125,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 		Spec: kubeovn.SubnetSpec{
 			CIDRBlock:  "12.10.0.0/16",
 			Namespaces: []string{namespace},
+			Protocol:   util.CheckProtocol("12.10.0.0/16"),
 		},
 	}
 	_, err = f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), &s, metav1.CreateOptions{})
@@ -287,6 +288,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 			ExcludeIps: underlayNodeIPs,
 			Vlan:       vlan.Name,
 			Namespaces: []string{underlay.Namespace},
+			Protocol:   util.CheckProtocol(underlayCIDR),
 		},
 	}
 	if _, err = f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), &subnet, metav1.CreateOptions{}); err != nil {

diff --git a/test/e2e/subnet/normal.go b/test/e2e/subnet/normal.go
@@ -67,6 +67,7 @@ var _ = Describe("[Subnet]", func() {
 				},
 				Spec: kubeovn.SubnetSpec{
 					CIDRBlock: cidr,
+					Protocol:  util.CheckProtocol(cidr),
 				},
 			}
 			_, err := f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), &s, metav1.CreateOptions{})
@@ -126,6 +127,7 @@ var _ = Describe("[Subnet]", func() {
 					CIDRBlock:   cidr,
 					GatewayType: kubeovn.GWCentralizedType,
 					GatewayNode: "kube-ovn-control-plane,kube-ovn-worker,kube-ovn-worker2",
+					Protocol:    util.CheckProtocol(cidr),
 				},
 			}
 			_, err := f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), &s, metav1.CreateOptions{})
@@ -158,6 +160,7 @@ var _ = Describe("[Subnet]", func() {
 				},
 				Spec: kubeovn.SubnetSpec{
 					CIDRBlock: cidr,
+					Protocol:  util.CheckProtocol(cidr),
 				},
 			}
 			_, err := f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), s, metav1.CreateOptions{})
@@ -196,6 +199,7 @@ var _ = Describe("[Subnet]", func() {
 				},
 				Spec: kubeovn.SubnetSpec{
 					CIDRBlock: cidr,
+					Protocol:  util.CheckProtocol(cidr),
 				},
 			}
 			_, err := f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), &s, metav1.CreateOptions{})
@@ -231,6 +235,7 @@ var _ = Describe("[Subnet]", func() {
 				},
 				Spec: kubeovn.SubnetSpec{
 					CIDRBlock: cidr,
+					Protocol:  util.CheckProtocol(cidr),
 				},
 			}
 
@@ -262,6 +267,7 @@ var _ = Describe("[Subnet]", func() {
 				Spec: kubeovn.SubnetSpec{
 					CIDRBlock:  "19.0.0.0/31",
 					ExcludeIps: []string{"179.17.0.0..179.17.0.10"},
+					Protocol:   util.CheckProtocol("19.0.0.0/31"),
 				},
 			}
 			_, err := f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), s, metav1.CreateOptions{})
@@ -285,6 +291,7 @@ var _ = Describe("[Subnet]", func() {
 				Spec: kubeovn.SubnetSpec{
 					CIDRBlock:  "29.0.0.0/30",
 					ExcludeIps: []string{"179.17.0.0..179.17.0.10"},
+					Protocol:   util.CheckProtocol("29.0.0.0/30"),
 				},
 			}
 			_, err := f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), s, metav1.CreateOptions{})
@@ -308,6 +315,7 @@ var _ = Describe("[Subnet]", func() {
 				Spec: kubeovn.SubnetSpec{
 					CIDRBlock:  "179.17.0.0/24",
 					ExcludeIps: []string{"179.17.0.0..179.17.0.10"},
+					Protocol:   util.CheckProtocol("179.17.0.0/24"),
 				},
 			}
 			_, err := f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), s, metav1.CreateOptions{})
@@ -375,6 +383,7 @@ var _ = Describe("[Subnet]", func() {
 					ExternalEgressGateway: egw,
 					PolicyRoutingPriority: priority,
 					PolicyRoutingTableID:  tableID,
+					Protocol:              util.CheckProtocol(cidr),
 				},
 			}
 			_, err = f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), subnet, metav1.CreateOptions{})
@@ -520,6 +529,7 @@ var _ = Describe("[Subnet]", func() {
 					PolicyRoutingPriority: priority,
 					PolicyRoutingTableID:  tableID,
 					Namespaces:            []string{namespace},
+					Protocol:              util.CheckProtocol(cidr),
 				},
 			}
 			_, err = f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), &s, metav1.CreateOptions{})

diff --git a/test/e2e/underlay/underlay.go b/test/e2e/underlay/underlay.go
@@ -240,6 +240,7 @@ var _ = Describe("[Underlay]", func() {
 					CIDRBlock:      "99.11.0.0/16",
 					Vlan:           Vlan,
 					LogicalGateway: true,
+					Protocol:       util.CheckProtocol(cidr),
 				},
 			}
 			_, err := f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), subnet, metav1.CreateOptions{})
@@ -281,6 +282,7 @@ var _ = Describe("[Underlay]", func() {
 					CIDRBlock:           "99.12.0.0/16",
 					Vlan:                Vlan,
 					DisableGatewayCheck: true,
+					Protocol:            util.CheckProtocol(cidr),
 				},
 			}
 			_, err := f.OvnClientSet.KubeovnV1().Subnets().Create(context.Background(), subnet, metav1.CreateOptions{})

diff --git a/yamls/crd.yaml b/yamls/crd.yaml
@@ -168,6 +168,10 @@ spec:
                   type: boolean
                 protocol:
                   type: string
+                  enum:
+                    - IPv4
+                    - IPv6
+                    - Dual
                 cidrBlock:
                   type: string
                 namespaces: