subnet support config mtu (#3367)

* subnet support config mtu Signed-off-by: changluyi <clyi@alauda.io> * gofmtpt Signed-off-by: Changlu Yi <clyi@alauda.io> * fix Signed-off-by: Changlu Yi <clyi@alauda.io> * include config vm mtu by dhcp option Signed-off-by: Changlu Yi <clyi@alauda.io> * fix Signed-off-by: Changlu Yi <clyi@alauda.io> --------- Signed-off-by: changluyi <clyi@alauda.io> Signed-off-by: Changlu Yi <clyi@alauda.io>
kubeovn · Nov 9, 2023 · 6d6eef4 · 6d6eef4
1 parent 005b92b
commit 6d6eef4
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 30 deletions.
diff --git a/charts/templates/kube-ovn-crd.yaml b/charts/templates/kube-ovn-crd.yaml
@@ -1714,6 +1714,10 @@ spec:
                       - 253 # default
                       - 254 # main
                       - 255 # local
+                mtu:
+                  type: integer
+                  minimum: 68
+                  maximum: 65535
                 private:
                   type: boolean
                 vlan:

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -2254,6 +2254,10 @@ spec:
                       - 253 # default
                       - 254 # main
                       - 255 # local
+                mtu:
+                  type: integer
+                  minimum: 68
+                  maximum: 65535
                 private:
                   type: boolean
                 vlan:

diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -140,6 +140,7 @@ type SubnetSpec struct {
 	ExternalEgressGateway string `json:"externalEgressGateway,omitempty"`
 	PolicyRoutingPriority uint32 `json:"policyRoutingPriority,omitempty"`
 	PolicyRoutingTableID  uint32 `json:"policyRoutingTableID,omitempty"`
+	Mtu                   uint32 `json:"mtu,omitempty"`
 
 	Private      bool     `json:"private"`
 	AllowSubnets []string `json:"allowSubnets,omitempty"`

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -620,20 +620,25 @@ func (c *Controller) checkSubnetConflict(subnet *kubeovnv1.Subnet) error {
 }
 
 func (c *Controller) updateSubnetDHCPOption(subnet *kubeovnv1.Subnet, needRouter bool) error {
-	mtu := util.DefaultMTU
-	if subnet.Spec.Vlan == "" {
-		switch c.config.NetworkType {
-		case util.NetworkTypeVlan:
-			// default to geneve
-			fallthrough
-		case util.NetworkTypeGeneve:
-			mtu -= util.GeneveHeaderLength
-		case util.NetworkTypeVxlan:
-			mtu -= util.VxlanHeaderLength
-		case util.NetworkTypeStt:
-			mtu -= util.SttHeaderLength
-		default:
-			return fmt.Errorf("invalid network type: %s", c.config.NetworkType)
+	var mtu int
+	if subnet.Spec.Mtu > 0 {
+		mtu = int(subnet.Spec.Mtu)
+	} else {
+		mtu = util.DefaultMTU
+		if subnet.Spec.Vlan == "" {
+			switch c.config.NetworkType {
+			case util.NetworkTypeVlan:
+				// default to geneve
+				fallthrough
+			case util.NetworkTypeGeneve:
+				mtu -= util.GeneveHeaderLength
+			case util.NetworkTypeVxlan:
+				mtu -= util.VxlanHeaderLength
+			case util.NetworkTypeStt:
+				mtu -= util.SttHeaderLength
+			default:
+				return fmt.Errorf("invalid network type: %s", c.config.NetworkType)
+			}
 		}
 	}
 

diff --git a/pkg/daemon/handler.go b/pkg/daemon/handler.go
@@ -255,29 +255,33 @@ func (csh cniServerHandler) handleAdd(req *restful.Request, resp *restful.Respon
 		}
 
 		var mtu int
-		if providerNetwork != "" && !podSubnet.Spec.LogicalGateway && !podSubnet.Spec.U2OInterconnection {
-			node, err := csh.Controller.nodesLister.Get(csh.Config.NodeName)
-			if err != nil {
-				errMsg := fmt.Errorf("failed to get node %s: %v", csh.Config.NodeName, err)
-				klog.Error(errMsg)
-				if err = resp.WriteHeaderAndEntity(http.StatusInternalServerError, request.CniResponse{Err: errMsg.Error()}); err != nil {
-					klog.Errorf("failed to write response: %v", err)
-				}
-				return
-			}
-			mtuStr := node.Labels[fmt.Sprintf(util.ProviderNetworkMtuTemplate, providerNetwork)]
-			if mtuStr != "" {
-				if mtu, err = strconv.Atoi(mtuStr); err != nil || mtu <= 0 {
-					errMsg := fmt.Errorf("failed to parse provider network MTU %s: %v", mtuStr, err)
+		if podSubnet.Spec.Mtu > 0 {
+			mtu = int(podSubnet.Spec.Mtu)
+		} else {
+			if providerNetwork != "" && !podSubnet.Spec.LogicalGateway && !podSubnet.Spec.U2OInterconnection {
+				node, err := csh.Controller.nodesLister.Get(csh.Config.NodeName)
+				if err != nil {
+					errMsg := fmt.Errorf("failed to get node %s: %v", csh.Config.NodeName, err)
 					klog.Error(errMsg)
 					if err = resp.WriteHeaderAndEntity(http.StatusInternalServerError, request.CniResponse{Err: errMsg.Error()}); err != nil {
 						klog.Errorf("failed to write response: %v", err)
 					}
 					return
 				}
+				mtuStr := node.Labels[fmt.Sprintf(util.ProviderNetworkMtuTemplate, providerNetwork)]
+				if mtuStr != "" {
+					if mtu, err = strconv.Atoi(mtuStr); err != nil || mtu <= 0 {
+						errMsg := fmt.Errorf("failed to parse provider network MTU %s: %v", mtuStr, err)
+						klog.Error(errMsg)
+						if err = resp.WriteHeaderAndEntity(http.StatusInternalServerError, request.CniResponse{Err: errMsg.Error()}); err != nil {
+							klog.Errorf("failed to write response: %v", err)
+						}
+						return
+					}
+				}
+			} else {
+				mtu = csh.Config.MTU
 			}
-		} else {
-			mtu = csh.Config.MTU
 		}
 
 		routes = append(podRequest.Routes, routes...)

diff --git a/test/e2e/kube-ovn/subnet/subnet.go b/test/e2e/kube-ovn/subnet/subnet.go
@@ -1245,6 +1245,29 @@ var _ = framework.Describe("[group:subnet]", func() {
 		checkNatPolicyRules(f, cs, fakeSubnet, fakeCidrV4, fakeCidrV6, false)
 		checkNatPolicyIPsets(f, cs, fakeSubnet, fakeCidrV4, fakeCidrV6, false)
 	})
+
+	framework.ConformanceIt("should support customize mtu of all pods in subnet", func() {
+		ginkgo.By("Creating subnet " + subnetName)
+		subnet = framework.MakeSubnet(subnetName, "", cidr, "", "", "", nil, nil, nil)
+		subnet.Spec.Mtu = 1600
+		subnet = subnetClient.CreateSync(subnet)
+
+		ginkgo.By("Creating pod " + podName)
+		annotations := map[string]string{
+			util.LogicalSwitchAnnotation: subnetName,
+		}
+
+		pod := framework.MakePod(namespaceName, podName, nil, annotations, framework.AgnhostImage, nil, nil)
+		_ = podClient.CreateSync(pod)
+
+		ginkgo.By("Validating pod MTU")
+		links, err := iproute.AddressShow("eth0", func(cmd ...string) ([]byte, []byte, error) {
+			return framework.KubectlExec(namespaceName, podName, cmd...)
+		})
+		framework.ExpectNoError(err)
+		framework.ExpectHaveLen(links, 1, "should get eth0 information")
+		framework.ExpectEqual(links[0].Mtu, int(subnet.Spec.Mtu))
+	})
 })
 
 func checkNatPolicyIPsets(f *framework.Framework, cs clientset.Interface, subnet *apiv1.Subnet, cidrV4, cidrV6 string, shouldExist bool) {

diff --git a/yamls/crd.yaml b/yamls/crd.yaml
@@ -2025,6 +2025,10 @@ spec:
                       - 253 # default
                       - 254 # main
                       - 255 # local
+                mtu:
+                  type: integer
+                  minimum: 68
+                  maximum: 65535
                 private:
                   type: boolean
                 vlan: