Merge pull request #718 from l1b0k/fix/lb

policy: remove disable-per-package-lb config

Author: BSWANG

cmd/terway-cli/cni_linux.go

@@ -63,3 +63,15 @@ func allowEBPFNetworkPolicy(require bool) (bool, error) {
 func checkKernelVersion(k, major, minor int) bool {
 	return kernel.CheckKernelVersion(k, major, minor)
 }
+
+func isOldNode() (bool, error) {
+	_, err := netlink.LinkByName("cilium_net")
+	if err == nil {
+		fmt.Printf("link cilium_net exist\n")
+		return true, nil
+	}
+	if !errors.As(err, &netlink.LinkNotFoundError{}) {
+		return false, err
+	}
+	return false, nil
+}

cmd/terway-cli/cni_unsupport.go

@@ -13,3 +13,7 @@ func checkKernelVersion(k, major, minor int) bool {
 func allowEBPFNetworkPolicy(enable bool) (bool, error) {
 	return enable, nil
 }
+
+func isOldNode() (bool, error) {
+	return false, nil
+}

cmd/terway-cli/policy.go

@@ -284,6 +284,18 @@ func policyConfig(container *gabs.Container) ([]string, error) {
 		ciliumArgs = append(ciliumArgs, extractArgs(h.CiliumExtraArgs)...)
 	}
 
+	old, err := isOldNode()
+	if err != nil {
+		return nil, err
+	}
+
+	// check the extra args
+	lo.Filter(ciliumArgs, func(item string, index int) bool {
+		if strings.Contains(item, "disable-per-package-lb") {
+			return old
+		}
+		return true
+	})
 	return ciliumArgs, nil
 }