mtu merge failed (#3417)

Signed-off-by: changluyi <clyi@alauda.io>
kubeovn · Nov 15, 2023 · 96b62d7 · 96b62d7
1 parent c1331e7
commit 96b62d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -690,7 +690,7 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 	if subnet.Spec.Mtu > 0 {
 		mtu = int(subnet.Spec.Mtu)
 	} else {
-		mtu := util.DefaultMTU
+		mtu = util.DefaultMTU
 		if subnet.Spec.Vlan == "" {
 			switch c.config.NetworkType {
 			case util.NetworkTypeVlan:

diff --git a/pkg/daemon/handler.go b/pkg/daemon/handler.go
@@ -261,20 +261,9 @@ func (csh cniServerHandler) handleAdd(req *restful.Request, resp *restful.Respon
 						}
 						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
 			}
 		}